Fixing views and controller + area references.