Changes in PArts of speech and few more modifications in UI