Starting work around improving the popup page
Prep for release 1.8.5