Application Layout Tweaks

Ey @effkay 

I've just updated the application layout according to @kuschti's and @ryabrody's (Thank you guise) inputs. Additionally I've written some awesome tests. Let me know what you think about it.

Cheers and enjoy your meal :fries: