Few more UI fixes