Renamed layouts and menus to be unique
Refactored arrow entry to take dynamic number of arrows