fix various padding and positioning bugs