Fixing the show view
Fixing the show view
Fixing merging problems