Added icons and smoothed out popup