Fixing views container layout issue