Some UI fixes..