beautify ui. and minor wording changes