Rohit here making view changes
fix-up
getting rid of merge issues rohit