adjust some css of popup
refactor all the files