Improving Grid Page (Issue #92)