Fixing view bugs