address daniel's comment and fix uistatic
Merge pull request #431 from uProxy/salomegeo-generic-ui

address daniel's comment and fix uistatic