Refactored partials, layouts & includes