Fix various spacing bugs