More Tweaks and Mobile Changes