dah fixes and improve ui