visual enhancements for popup, clean code