lots of cleanup, improved mobile experience