Resolve problem with edit btn;
add popup-dialog, update js + css