More UI compact-ness tweaks...