Merge "Update Layout building method"