Moving Buttons class to clean up code