Refactored to allow for display from Login as well