Changed service grid back to using a table