@RoySegall saw this after I merged, can you be sure that active class is always first?