Changed grid classes to be more semantic