Merge pull request #12 from specialhappy/master

admin instrument & customer layout
little bug
Merge pull request #3 from JasonGuanGitHub/master

pull request