Got the view working
Fixed merge conflicts