overhaul pages and fix router bug