Some ui refresh
more ui update
More updates