GUI Screen rewrite and betterment