Updated view with new functionality