polish UI
Merge branch 'master' of https://github.com/waterbase/waterbase-app
test UI changes