Improved main presenter ; Started to add menus