Fixing UX issues after live device testing