New layout etc.
DONE
Merge pull request #1 from Gielert/dev

Dev