Fixed Issues after User Testing