Worked on the settings view. Performance fixes
Merge branch 'master' of github.com:MMrko/t-111.5350-project