Matrix offset bug fixed
Now uses Button class
Updated to using Button class
Temporarily removed functionality
Minor clean up