fixed ui-freeze bug
implementet states