simplify names and add popupmixin