Improved plotting of model