Removing blue buttons from popups
Progress on popup template logic