Fixed Bugs with label postiton