Finished adding back in menus except for positioning