Clean up of names; added menu items to main layout