new UI Feature and bugs fixed