re-organized html