style changes
styles
popups styling
 merged
fully merged