Refactoring and cleaning up
Set button id rather than using .button class