Mahendra | #541 | Moving labels from html to resource bundle