Session Awareness in Subjects Page and removal of hardcoding