solution reaorganization and popup window