added real data to prescription screen
fixed merge conflict