First implementation of the #80 issue.
Fix loading views for the #80 issue.