buttons fixes and grid update.