Reorganized layout - no overlapping fields anymore