Fixed issues with the view