removed _menu guards from Application
merged Application with better indents and no guards
fix indentation