Updating grid to actually match markup, switch buttons to spans to prevent markup conflict