Offline viewing fix with comments