Merge pull request #1930 from Mark-de-Haan/master

Fix edit mode on homepage. Fixed several layouts