grid work - edit to work properly, fix ids