Final Commit

Fixed button errors.