Refactored View part
Fixed conflict
Merge branch 'risto1913-master'
Merge pull request #2 from SindreSvendby/master

getting in sync