Figures sorted

figures ok now