Finish filling in layouts