Merged Completed Code Maybe
Fixed GUI