Refactored html markup