FMS-273 - DEBUG: Fix layout