Fixed:
Fixed UI issues