[FIX] Add missing imports
[IMP] Improve views