fixed issues #631, #632
fixed issue #620, #633
Merge pull request #635 from safiyu/UIissue6

fixed issue #620, #631, #632, #633