Add proper positioning for labels