V1.2

Fixed navbar