Fixed a bug and simplified the special page

Change-Id: Ifa5d7601ea3e4c7881d699be448f8126a1951bee