sorta fixed some menu issues