style: Better handling of popup + entrance/exit animation