Final changes to layouts