Add SurroundWith plugin and misc cleanup of plugins page