added some UI improvments