updated with quotes screens