better page management, refactoring, & cleanups