Fixed issue455, integrated Kevin's code,fixed toptranslation error and m...

...odified UI