Fixed issues with views