changed models
changed template a bit
merged robs changes
merge rob's javascript