Add some UI changes and Login flow