Cleaned up the UI and made it safer for users.