Button Changes merge

Pull request for the buttonChanges branch; probably won't be needed as I believe the changes are already made on Master.