Reworked layout

Layout to be confirmed, internal layouts and what is actually displayed
to be decided.
Merge branch 'master' of https://github.com/srizzling/NatureQuestServer