Layout improvements. Added checkbuttons