Fixed broken

fixed broken stuff
added table and form