html improvements
refactoring