Bug fix and initial sales form