#89 #113 Rewrite lots of pages and fix the bug