Tweak sort order, add JS remove alerts