Fix up return data, add back button, add clear data functionality