restart popup
merge css and master