Fixed more GUI issues...
Merge remote-tracking branch 'origin/Aaron' into Tolga