Added Buttons and Updated Interfaces