PM plugin - UI and code clean-up, also #125