Grid Fix

Moved to more logical grid system