ui issue fixes