Fix copy, add buttons