added color change, fix popup