Banner, Mainframe, Menue refactoring & cleanup