some UI fixes and more user-friendly logic