Updated GUI code and added two temporary utility classes