Improved address layout