Improve arrangement of blueprint fields