fixes #6114 Co-authored-by: Lucas Bordeau <bordeau.lucas@gmail.com>
* Implement new view picker * Complete feature * Fixes according to review