Added MPC browser to popup & code cleanup