Refactored and added active session in display layout