Layout fixes

Set header height to 320
Merge branch 'develop'