Even moar views

Integrated markup for result page, misc. cleanup elsewhere