changed models and fixed bug in forms