Add colors and improve popups