Resize elements to fit window
Merge branch 'develop'