Tons of bug fixes for offline viewing