Update basic template and layout