Fixes to fit new app circle bar!

Change-Id: I39e7d45bccf274a76087a58b4b7b003c4683e453