changed some views
merging everything