fixed up ui bugs