Added a few more UX edge cases