moved buttons out of spans