Fixed issues with 2 views