more UI fixes..