Cleanup DetailGridScreen code