Cleaned up view a little bit