Changing layout, sorting nav buttons.
Merge branch 'master' of github.com:tropicalmug/profile