Minor fixes to the UI to make the expected behavior more clear.