style: popup and fixes