Fixed panel plot and shortened code