Several changes/additions to GUI classes