Improved layout with partials