Fixed some stuff from user-testing