cleaned up basic pages and api