Added Listeners, updated Buttons