Updated Dashboard View and Others