Some refactoring, finishing up UI part.

Some refactoring, added possibility to change state of the feature in
UI.