change ui and fix bugs