finished refactoring show views