Changed layout to accommodate locking
Fixed Autolayout hickups
Added lock screen
Removed unused views
Some refactorings