Updated front-end to use session instead of view data