modified translation
added popin
general update