Cleaned up integration of new pages