Fixed some things and Also changed the menus