Cosmetic changes for titles and labels...AND NO TRAILING WHITESPACES.
Merge pull request #1214 from Kiyumars/feature-gifts

Cosmetic changes for titles and labels...AND NO TRAILING WHITESPACES.