notify me code fixes on xs and s devices