fixed navigation in several areas