updated models for new attributes, lots of layout updates