Potential GUI Bug Fixes

Needs testing