Revert "Updated to newer version of gui code"

This reverts commit 256ebc3cad8be51afb13caa4076d68c5b09bd21c.
Merge branch 'master' of https://github.com/nealcm/CSD