Improved panel layout