Fixed grid alignment issues