revert back to old appbar, new one has some issues i need to look into before going live

Change-Id: I949df0a69fad47969458184d4c1258f41571bcc3