Refactoring, adding support for bg image, various updates.
More refactoring and some minor tweaks to the popup look and feel