progress on fixng navbar