more streamlined UI
added some more partials
lots of changes - added contained routes
complex merge