WIP Lockscreen clean up and re-design