Reorganize + valid HTML