Fix and re-order lockscreen settings