minor bug fix and popup style change