Bug fixes
- Detailed information in Grid
- Minor fixes