Remove partials so as to only have one view, other small fixes