Re-organized HTML pages