Working on button functionalities
Merge branch 'master' of https://github.com/RITAccess/JBrick