removed default clicks and cleaned up the controllers
Merge pull request #186 from LI-HE/master

removed default clicks and cleaned up the controllers