Update lockscreen layouts, fix derps, etc