Some updates to layouts