Final edit for new dev page and  2.0 (not dev)