Fix menu and category buttons
Merge branch 'feature/menu_cursor' into develop