refactor controllers, eliminate static pages controller, add independant versions