add import on main view and small fixes