Revamp HTML; functionality preserved