Improve label layout. gsjlint issue.