megrate to new UI all functionality