Bug fix
Moved display page from logic to templates