Housekeeping - removing redundant images. Improving error page output