UI fixes

-minor bug fixes