fixing menu issues