UI fixes after merging partials_refactor branch