UI Changes

UI changes recomand by satish as well krishna
Fixes