Grid fixes for Oliver, Graphics fixes for Nick