Bringing up view compatibility with 1.5
Cleaned up HTML mess