refactor for proper click handlers
Merge branch 'merge-pages' of github.com:phoenix-scitent/okm into merge-pages
refactors into proper files