lots of new clean up and detail page