Some sizing/spacing touch-ups

Just getting the many rects in order