Added PM icon back in
Fix more PM bugs