Cleanup thierry his enum mess and table conventions.
Fixed gui to match these changes