fixed issues #613, #614, #615
Merge pull request #625 from safiyu/UIissue4

fixed issues #613, #614, #615