Fixing bug.
Improving models to simplify views.