Merge pull request #31 from am11/master

Layout: Adds active class to menu for better UX
Merge pull request #32 from am11/master

Account: Adds desired fields to EditProfile
Merge pull request #33 from am11/master

Layout: Minor fixes