continuing mobile first rewrite