2 fixes

1. Fix inconsistency in button click handler method names in view
2. Model subscribes to view messages directly rather than going through
controller