Merged changes from https://github.com/vipinsthename/environment-dashboard/pull/8