Tidying up and adding offset from parent