Add session filter/element and adjust some classes