Cleaned up view a bit.