Fix zoom, organise code