Small GUI Changes And Cleaned Up

Cleaned Up With a little SubString.