Removed buggy imports from views.
Merge branch 'hotfix/fix_buggy_imports'