Updated with Sara's Changes

Updated the UI with Sara's Changes