Reworked Grid to directive