active class fixes and minor changes