Updated styles for popup
Merge style changes