ID-68 / GCI-31 (updating Navigation bar)

Modified navbar view as per the wireframe - (https://issues.openmrs.org/secure/attachment/42375/id-wireframe-2.png)