cleaned up some page types