Fix curriculum nav overlap, selector cleanup