Fixed edit order menu, fixed themes selection