Fix batterybar in navbar && fix navbar layouts

Change-Id: I6c0d568e4fc0b4ef5aedc835bdc54b212c1e96c2