Added Buttons, fixed retry button