Security final; Navigation menu fix