UI updates and login fixed