More layout style tightening, leave padding/etc to panel contents