Small changes before next step of considering template / site layout