Moved contents from layout into partials