merge fix
cleanup
chat improvements and grid states