Fixes after first two days of usability testing