More cleanup of layout
Merge branch 'develop' of https://github.com/haavardlian/UbiSolar into develop