Refactored all button handlers
Fixed id-s, need not to be the same