fixed some more view logic