Mantis fixing issues
Menu fixes