More menu fixes and split ups