Fixing view stuff