Fixed layput and plot referencing