Supporting both One page checkout and 5 steps checkout

Everything is in the title.