Client bookmark : popup is now in it's own class