orders and ui improvments