added table and form and cleaned up