Final fixes for settings view.
Merge branch 'master' of github.com:MMrko/t-111.5350-project