fixed a lot of views, controllers, etc
merged conflicts