Code cleanup, moved menu's around to fit into the top navigation bar