Working on new UI (Extra Values)
DbSchema fixes