#330 Improved radial layout