added some UI fixes