Partials refactoring and layout updates