JAL-1201 more layout tweaks