added modernizer to leaf and cleaned up acctions