Partial commit from Prabhat's comp
Some level of UI chnages.