new ui and bugs solved