Improved pan layout