Several fixes
Improves and removed import/export view
Cleanup code
Cleanup