update ui and fix