Refactor html & fix tags