modify styles
try to clean html
Refactoring