new UI & improvement