Cleaned up HTML templates