Add more pages and fix a bug using $TODO