Code cleaning and minor fixes in comic display