Feature/fix ui release0.9.7