Use pushState and fix movie edit bug