Simplify some code.
Merge pull request #752 from vsn4ik/simplify_ui

Simplify some code.