Prevent flickering of label border + fixes