styled views
merge conflict resolved