ui fix & script changes