refactor due to changes
fix typo
simplified button class