Feature/82 columnise forms