Improved UI and included login functionality