Fixed up label positioning