Menu refactored
Views improved