Fix active button ui
Fix import/export popup margin @ timeslider
Merge pull request #2256 from 0ip/develop

Fix active button UI, when a popup is shown