Merge branch 'develop'
[57] Add active navbars and change layout
Merge branch 'task-57-fix_column_heights' into develop