Merge "Rework user info window"