Add fresh look on views
Merge from github