Made UI impovements