Simplified menu
Applying controllers in layout.html
Minor style changes
Refactored Angular modules