fixed some UI issues & added new UI features.