US600 - HTML refactoring.
US637 - Style update