Completed build layout re-arrangement.