UI tweaks

Change-Id: I4f2869eae17bdeb28109a10e08963ca18a17c5af
put in a hacky persistence solution for g+

Change-Id: Ia6cd11228f6e4200a6f16929d21d9bfa72327d78