added sub contents, tweaked popup windows