Update menu code

Menu is now easier and more semantic