Added initial classes and better html