Made menu module mostly safer.