Changes to toolbar and sidebar/footer