moved classes into Presentation group
refactored menu displaying code