Removed old rr form markup and add equity markup