bug fix
refactor code and do big changes for ui interaction