#86 Improved visual balance