Made some adjustments for the collection navigation bar Change-Id: I02582a03bbee21b5a623902f5794ae353f754ddb