Fixed various grid issues. Far from complete.