bugfix and ui upgrade