Switching to plotting on axes rather than figure