General fixes and improvements to padding and sizing