Added support for simulator commands and fixed the nav menu