Added error state and dataset
Presentation update