JSHint refactoring.
More consistent html structure