Progress
Layout fixes.
Some model attributes