Fixed view bugs