Tweaked frame editor loading and fixed potential swiping issue