label positioning changes due to PR:3451
whitespaces cleanup