More fixes on UI