Better active nav & admin update