More views stuff
Fixed conflict, merge successful