update UI, part of marker
Merge pull request #41 from pannellr/vivian2

change user class
Merge pull request #43 from pannellr/hulance2

update UI, part of marker
update the project