Add error handling and expand-all to UI