Cleaned up view visibilities