UI fixes in response to user feedback