Improved UI for short screens
Fixed access bug, and improved security