Label angle and bug fix