Popup.js refactoring

Still need to save usage values in their own model