Move menu to new files
redesign and move menu