Fixing evaluation view and functionality.