Fixed some menu issues and cross phase compability issues