Refactorin partials & style