Bug fixing, improving ui