Refactor html and less