Label bugs

Fixed some label placement bugs