Improve menu with tab based menu