finish modifying cdug UI
Merge branch 'master' of github.com:JingkaiZhao/SaaSPower