grid layout removed
merged with lukas's commit
Merge remote-tracking branch 'origin/app' into app
merged with lukas's commit