Integrated into new UI

minor fixes