removed some unecessary repetition fixed some view things
Fixed merge conflicts
Fixed merge conflicts