Fixed logic to persist an item to the cloud and small formatting changes