Refactored view to not interact with session