ui fix & script changes
Merge pull request #179 from benitoro/master

ui fix & script changes