Changed to allow more html options in popups