Updated GUI stuff

There are some extra event binding that had to do with added scans and
changes to variable names to be more consistent. Maybe.
Anyway, this is more recent.