Label layout improved