More usability testing changes. May need to be reverted.