Refactored html structure