backported some menu changes

Signed-off-by: DarkSnake-Kobra <jbttoms@gmail.com>