ui and ws improvements