improveUI
Fix login issue