Refacto html structure and style added