Refactor view partials and update styles