Finish more layout