Refactored show view as well