Made some modifications to the Unit Layer generator