started updating layout
fixed merge conflicts
Merge pull request #111 from LasseSviland/master

	started updating layout