Fixes for markup and images