Added code for fixing menu

 and something else I can't rememmber