Update/mainjs to use popup presenter tmp 18

Hooking up the stuff for fun and profit