Added new UI features