Fix list grid spacing issue
Fix foreign key lookup issue