Move lockscreen setting to a more native place
Rearrange settings one more time && drop advanced headers