Fixed:: Menu bugs