Moved the axes positioning code out of an else to make sure all situations are captured.