merged several ui changes
Merge pull request #46 from ray1claw/1.x-yaspa.m-dev

merged several ui changes