UI fixes
code modified