more cleanup + development of basic page