refactoring button handlers
added button classes