Setting button title along with unit name and fixed UI issues on left border line.