[IMP] Improved view to fix container div issue