Bugfix for elevation layer; small refactor of rescale elevation layer