New popin design - fixes #81