Fixed menu issues!