backup branding changes and fix some bugs in mobile version of popup