Cleaned up built-in argument hierarchy
More GUI work