#48 add onClick methods where possible and do small refactorings
merged