gui updates, adding modes / constants
resolving merge conflict