Updated a few layouts