Clean Menu Code

Shortening and simplifying the menu system