Finished all buttons, slight adjustment to timing