some view stuff
merging