Tidying up and adding image