Further functionality for display page.
Refactoring