Fixing few UI problems detected on think aloud interview with Jessica.