convert to new UI
Merge branch 'trunk' into fix_bugs_from_aminh
fixbug
Merge pull request #5 from voer-platform/fix_bugs_from_aminh

Fix bugs from aminh