gui updates, minor refactoring