Some more spacing and sizing cleanup