Updates to layouts/chunks/base