Refactored html & changed html tags