Views and menus enhancements