Feature/add grid directive