changed model
changed template and addded form behaviour