Added inline editing and error handling