Updated the first screen according ti approved mockup