Reverted Wizard Interface and just added grid interface.