Before button generation with jquery.
Lots of refactoring
Removed Make... blocks.
Added next button.