UI change
Updated UI and Script
Merged code