improved model definitions, updated DOM el placement