New menu system

with tabs