Updated templates, styling, app controllers, menus
Merge remote-tracking branch 'origin/rick'