Reorganized html structure