Improved neighbors layout