Navigation menu improved
minor bug fixed