Made more modular by: Removed html template in favor of more modular inline templates. Updated css to be more module, Also fixed popup issue with scope comparator failing.