finished job and fixed navagation bar