fixed some errors on the show view
merged files