cleanup, fix page classes