Fixed more view bugs