Placeholders & Merged

Added placeholders for other items.  Merged popup.js with original
content