From c7e306841a933b022aed30713f4432b361f0e4c0 Mon Sep 17 00:00:00 2001
From: Anthony Lapenna <lapenna.anthony@gmail.com>
Date: Thu, 1 Jun 2017 10:14:55 +0200
Subject: [PATCH] feat(settings): add settings management (#906)

---
 api/bolt/datastore.go                         |   8 +
 api/bolt/internal/internal.go                 |  10 ++
 api/bolt/settings_service.go                  |  61 +++++++
 api/cli/cli.go                                |  22 ++-
 api/cli/defaults.go                           |   1 -
 api/cli/defaults_windows.go                   |   1 -
 api/cmd/portainer/main.go                     |  48 +++++-
 api/errors.go                                 |   5 +
 api/http/handler/handler.go                   |   3 +
 api/http/handler/settings.go                  |  64 +++++--
 api/http/handler/status.go                    |  38 +++++
 api/http/handler/templates.go                 |  19 ++-
 api/http/proxy/containers.go                  |  28 ++-
 api/http/proxy/factory.go                     |   3 +
 api/http/proxy/filter.go                      |  21 +++
 api/http/proxy/manager.go                     |   3 +-
 api/http/proxy/service.go                     |  14 +-
 api/http/proxy/transport.go                   |  96 ++++++++---
 api/http/proxy/utils.go                       |  15 ++
 api/http/proxy/volumes.go                     |  14 +-
 api/http/server.go                            |  14 +-
 api/portainer.go                              |  34 +++-
 app/app.js                                    |  25 ++-
 app/components/auth/authController.js         |  10 +-
 .../containerConsoleController.js             |   4 +-
 .../containers/containersController.js        |  25 ++-
 .../createContainerController.js              |  79 ++++-----
 .../dashboard/dashboardController.js          |  18 +-
 app/components/images/imagesController.js     |   4 +-
 app/components/network/networkController.js   |  34 ++--
 app/components/networks/networksController.js |  10 +-
 app/components/settings/settings.html         | 159 ++++++++++++++----
 app/components/settings/settingsController.js | 105 +++++++++---
 app/components/sidebar/sidebar.html           |   7 +-
 app/components/sidebar/sidebarController.js   |  12 +-
 .../templates/templatesController.js          |  50 +++---
 app/components/userSettings/userSettings.html |  68 ++++++++
 .../userSettings/userSettingsController.js    |  29 ++++
 app/directives/header-content.js              |   2 +-
 app/helpers/containerHelper.js                |  15 --
 app/models/api/settings.js                    |   6 +
 app/models/api/status.js                      |   6 +
 app/rest/{ => api}/auth.js                    |   0
 app/rest/{ => api}/endpoint.js                |   0
 app/rest/{ => api}/resourceControl.js         |   0
 app/rest/api/settings.js                      |   8 +
 app/rest/api/status.js                        |   7 +
 app/rest/{ => api}/team.js                    |   0
 app/rest/{ => api}/teamMembership.js          |   0
 app/rest/{ => api}/template.js                |   0
 app/rest/{ => api}/user.js                    |   0
 app/rest/config.js                            |   4 -
 app/rest/containerCommit.js                   |  10 --
 app/rest/{ => docker}/container.js            |   4 +-
 app/rest/docker/containerCommit.js            |  10 ++
 app/rest/{ => docker}/containerLogs.js        |   4 +-
 app/rest/{ => docker}/containerTop.js         |   4 +-
 app/rest/{ => docker}/event.js                |   4 +-
 app/rest/{ => docker}/exec.js                 |   4 +-
 app/rest/{ => docker}/image.js                |   4 +-
 app/rest/docker/info.js                       |   7 +
 app/rest/{ => docker}/network.js              |   4 +-
 app/rest/{ => docker}/node.js                 |   4 +-
 app/rest/{ => docker}/response/handlers.js    |   0
 app/rest/{ => docker}/secret.js               |   4 +-
 app/rest/{ => docker}/service.js              |   4 +-
 app/rest/docker/swarm.js                      |  10 ++
 app/rest/{ => docker}/task.js                 |   4 +-
 app/rest/docker/version.js                    |   7 +
 app/rest/{ => docker}/volume.js               |   4 +-
 app/rest/info.js                              |   7 -
 app/rest/swarm.js                             |  10 --
 app/rest/version.js                           |   7 -
 app/services/{ => api}/endpointService.js     |   0
 .../{ => api}/resourceControlService.js       |   0
 app/services/api/settingsService.js           |  26 +++
 app/services/api/statusService.js             |  22 +++
 .../{ => api}/teamMembershipService.js        |   0
 app/services/{ => api}/teamService.js         |   0
 app/services/{ => api}/userService.js         |   0
 app/services/{ => docker}/containerService.js |   9 +-
 app/services/{ => docker}/imageService.js     |   0
 app/services/{ => docker}/infoService.js      |   0
 app/services/{ => docker}/networkService.js   |   0
 app/services/{ => docker}/nodeService.js      |   0
 app/services/{ => docker}/secretService.js    |   0
 app/services/{ => docker}/serviceService.js   |   0
 app/services/{ => docker}/taskService.js      |   0
 app/services/{ => docker}/volumeService.js    |   0
 app/services/lineChart.js                     |   2 +-
 app/services/pagination.js                    |   4 +-
 app/services/settings.js                      |  17 --
 app/services/stateManager.js                  | 138 +++++++++------
 93 files changed, 1086 insertions(+), 457 deletions(-)
 create mode 100644 api/bolt/settings_service.go
 create mode 100644 api/http/handler/status.go
 create mode 100644 app/components/userSettings/userSettings.html
 create mode 100644 app/components/userSettings/userSettingsController.js
 create mode 100644 app/models/api/settings.js
 create mode 100644 app/models/api/status.js
 rename app/rest/{ => api}/auth.js (100%)
 rename app/rest/{ => api}/endpoint.js (100%)
 rename app/rest/{ => api}/resourceControl.js (100%)
 create mode 100644 app/rest/api/settings.js
 create mode 100644 app/rest/api/status.js
 rename app/rest/{ => api}/team.js (100%)
 rename app/rest/{ => api}/teamMembership.js (100%)
 rename app/rest/{ => api}/template.js (100%)
 rename app/rest/{ => api}/user.js (100%)
 delete mode 100644 app/rest/config.js
 delete mode 100644 app/rest/containerCommit.js
 rename app/rest/{ => docker}/container.js (85%)
 create mode 100644 app/rest/docker/containerCommit.js
 rename app/rest/{ => docker}/containerLogs.js (65%)
 rename app/rest/{ => docker}/containerTop.js (53%)
 rename app/rest/{ => docker}/event.js (56%)
 rename app/rest/{ => docker}/exec.js (55%)
 rename app/rest/{ => docker}/image.js (83%)
 create mode 100644 app/rest/docker/info.js
 rename app/rest/{ => docker}/network.js (68%)
 rename app/rest/{ => docker}/node.js (62%)
 rename app/rest/{ => docker}/response/handlers.js (100%)
 rename app/rest/{ => docker}/secret.js (59%)
 rename app/rest/{ => docker}/service.js (65%)
 create mode 100644 app/rest/docker/swarm.js
 rename app/rest/{ => docker}/task.js (53%)
 create mode 100644 app/rest/docker/version.js
 rename app/rest/{ => docker}/volume.js (64%)
 delete mode 100644 app/rest/info.js
 delete mode 100644 app/rest/swarm.js
 delete mode 100644 app/rest/version.js
 rename app/services/{ => api}/endpointService.js (100%)
 rename app/services/{ => api}/resourceControlService.js (100%)
 create mode 100644 app/services/api/settingsService.js
 create mode 100644 app/services/api/statusService.js
 rename app/services/{ => api}/teamMembershipService.js (100%)
 rename app/services/{ => api}/teamService.js (100%)
 rename app/services/{ => api}/userService.js (100%)
 rename app/services/{ => docker}/containerService.js (86%)
 rename app/services/{ => docker}/imageService.js (100%)
 rename app/services/{ => docker}/infoService.js (100%)
 rename app/services/{ => docker}/networkService.js (100%)
 rename app/services/{ => docker}/nodeService.js (100%)
 rename app/services/{ => docker}/secretService.js (100%)
 rename app/services/{ => docker}/serviceService.js (100%)
 rename app/services/{ => docker}/taskService.js (100%)
 rename app/services/{ => docker}/volumeService.js (100%)
 delete mode 100644 app/services/settings.js

diff --git a/api/bolt/datastore.go b/api/bolt/datastore.go
index 96b179b46..3c56ede26 100644
--- a/api/bolt/datastore.go
+++ b/api/bolt/datastore.go
@@ -22,6 +22,7 @@ type Store struct {
 	EndpointService        *EndpointService
 	ResourceControlService *ResourceControlService
 	VersionService         *VersionService
+	SettingsService        *SettingsService
 
 	db                    *bolt.DB
 	checkForDataMigration bool
@@ -35,6 +36,7 @@ const (
 	teamMembershipBucketName  = "team_membership"
 	endpointBucketName        = "endpoints"
 	resourceControlBucketName = "resource_control"
+	settingsBucketName        = "settings"
 )
 
 // NewStore initializes a new Store and the associated services
@@ -47,6 +49,7 @@ func NewStore(storePath string) (*Store, error) {
 		EndpointService:        &EndpointService{},
 		ResourceControlService: &ResourceControlService{},
 		VersionService:         &VersionService{},
+		SettingsService:        &SettingsService{},
 	}
 	store.UserService.store = store
 	store.TeamService.store = store
@@ -54,6 +57,7 @@ func NewStore(storePath string) (*Store, error) {
 	store.EndpointService.store = store
 	store.ResourceControlService.store = store
 	store.VersionService.store = store
+	store.SettingsService.store = store
 
 	_, err := os.Stat(storePath + "/" + databaseFileName)
 	if err != nil && os.IsNotExist(err) {
@@ -100,6 +104,10 @@ func (store *Store) Open() error {
 		if err != nil {
 			return err
 		}
+		_, err = tx.CreateBucketIfNotExists([]byte(settingsBucketName))
+		if err != nil {
+			return err
+		}
 		return nil
 	})
 }
diff --git a/api/bolt/internal/internal.go b/api/bolt/internal/internal.go
index e02c26ba4..f55f72118 100644
--- a/api/bolt/internal/internal.go
+++ b/api/bolt/internal/internal.go
@@ -57,6 +57,16 @@ func UnmarshalResourceControl(data []byte, rc *portainer.ResourceControl) error
 	return json.Unmarshal(data, rc)
 }
 
+// MarshalSettings encodes a settings object to binary format.
+func MarshalSettings(settings *portainer.Settings) ([]byte, error) {
+	return json.Marshal(settings)
+}
+
+// UnmarshalSettings decodes a settings object from a binary data.
+func UnmarshalSettings(data []byte, settings *portainer.Settings) error {
+	return json.Unmarshal(data, settings)
+}
+
 // Itob returns an 8-byte big endian representation of v.
 // This function is typically used for encoding integer IDs to byte slices
 // so that they can be used as BoltDB keys.
diff --git a/api/bolt/settings_service.go b/api/bolt/settings_service.go
new file mode 100644
index 000000000..9ea7cc2ab
--- /dev/null
+++ b/api/bolt/settings_service.go
@@ -0,0 +1,61 @@
+package bolt
+
+import (
+	"github.com/portainer/portainer"
+	"github.com/portainer/portainer/bolt/internal"
+
+	"github.com/boltdb/bolt"
+)
+
+// SettingsService represents a service to manage application settings.
+type SettingsService struct {
+	store *Store
+}
+
+const (
+	dbSettingsKey = "SETTINGS"
+)
+
+// Settings retrieve the settings object.
+func (service *SettingsService) Settings() (*portainer.Settings, error) {
+	var data []byte
+	err := service.store.db.View(func(tx *bolt.Tx) error {
+		bucket := tx.Bucket([]byte(settingsBucketName))
+		value := bucket.Get([]byte(dbSettingsKey))
+		if value == nil {
+			return portainer.ErrSettingsNotFound
+		}
+
+		data = make([]byte, len(value))
+		copy(data, value)
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	var settings portainer.Settings
+	err = internal.UnmarshalSettings(data, &settings)
+	if err != nil {
+		return nil, err
+	}
+	return &settings, nil
+}
+
+// StoreSettings persists a Settings object.
+func (service *SettingsService) StoreSettings(settings *portainer.Settings) error {
+	return service.store.db.Update(func(tx *bolt.Tx) error {
+		bucket := tx.Bucket([]byte(settingsBucketName))
+
+		data, err := internal.MarshalSettings(settings)
+		if err != nil {
+			return err
+		}
+
+		err = bucket.Put([]byte(dbSettingsKey), data)
+		if err != nil {
+			return err
+		}
+		return nil
+	})
+}
diff --git a/api/cli/cli.go b/api/cli/cli.go
index 68a017b1d..80308d41a 100644
--- a/api/cli/cli.go
+++ b/api/cli/cli.go
@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"log"
 	"time"
 
 	"github.com/portainer/portainer"
@@ -29,14 +30,11 @@ func (*Service) ParseFlags(version string) (*portainer.CLIFlags, error) {
 
 	flags := &portainer.CLIFlags{
 		Endpoint:          kingpin.Flag("host", "Dockerd endpoint").Short('H').String(),
-		Logo:              kingpin.Flag("logo", "URL for the logo displayed in the UI").String(),
-		Labels:            pairs(kingpin.Flag("hide-label", "Hide containers with a specific label in the UI").Short('l')),
 		ExternalEndpoints: kingpin.Flag("external-endpoints", "Path to a file defining available endpoints").String(),
 		SyncInterval:      kingpin.Flag("sync-interval", "Duration between each synchronization via the external endpoints source").Default(defaultSyncInterval).String(),
 		Addr:              kingpin.Flag("bind", "Address and port to serve Portainer").Default(defaultBindAddress).Short('p').String(),
 		Assets:            kingpin.Flag("assets", "Path to the assets").Default(defaultAssetsDirectory).Short('a').String(),
 		Data:              kingpin.Flag("data", "Path to the folder where the data is stored").Default(defaultDataDirectory).Short('d').String(),
-		Templates:         kingpin.Flag("templates", "URL to the templates (apps) definitions").Default(defaultTemplatesURL).Short('t').String(),
 		NoAuth:            kingpin.Flag("no-auth", "Disable authentication").Default(defaultNoAuth).Bool(),
 		NoAnalytics:       kingpin.Flag("no-analytics", "Disable Analytics in app").Default(defaultNoAuth).Bool(),
 		TLSVerify:         kingpin.Flag("tlsverify", "TLS support").Default(defaultTLSVerify).Bool(),
@@ -47,6 +45,10 @@ func (*Service) ParseFlags(version string) (*portainer.CLIFlags, error) {
 		SSLCert:           kingpin.Flag("sslcert", "Path to the SSL certificate used to secure the Portainer instance").Default(defaultSSLCertPath).String(),
 		SSLKey:            kingpin.Flag("sslkey", "Path to the SSL key used to secure the Portainer instance").Default(defaultSSLKeyPath).String(),
 		AdminPassword:     kingpin.Flag("admin-password", "Hashed admin password").String(),
+		// Deprecated flags
+		Labels:    pairs(kingpin.Flag("hide-label", "Hide containers with a specific label in the UI").Short('l')),
+		Logo:      kingpin.Flag("logo", "URL for the logo displayed in the UI").String(),
+		Templates: kingpin.Flag("templates", "URL to the templates (apps) definitions").Short('t').String(),
 	}
 
 	kingpin.Parse()
@@ -79,6 +81,8 @@ func (*Service) ValidateFlags(flags *portainer.CLIFlags) error {
 		return errNoAuthExcludeAdminPassword
 	}
 
+	displayDeprecationWarnings(*flags.Templates, *flags.Logo, *flags.Labels)
+
 	return nil
 }
 
@@ -122,3 +126,15 @@ func validateSyncInterval(syncInterval string) error {
 	}
 	return nil
 }
+
+func displayDeprecationWarnings(templates, logo string, labels []portainer.Pair) {
+	if templates != "" {
+		log.Println("Warning: the --templates / -t flag is deprecated and will be removed in future versions.")
+	}
+	if logo != "" {
+		log.Println("Warning: the --logo flag is deprecated and will be removed in future versions.")
+	}
+	if labels != nil {
+		log.Println("Warning: the --hide-label / -l flag is deprecated and will be removed in future versions.")
+	}
+}
diff --git a/api/cli/defaults.go b/api/cli/defaults.go
index 5de413911..80ba58c51 100644
--- a/api/cli/defaults.go
+++ b/api/cli/defaults.go
@@ -6,7 +6,6 @@ const (
 	defaultBindAddress     = ":9000"
 	defaultDataDirectory   = "/data"
 	defaultAssetsDirectory = "."
-	defaultTemplatesURL    = "https://raw.githubusercontent.com/portainer/templates/master/templates.json"
 	defaultNoAuth          = "false"
 	defaultNoAnalytics     = "false"
 	defaultTLSVerify       = "false"
diff --git a/api/cli/defaults_windows.go b/api/cli/defaults_windows.go
index da5f0ce45..5e80489e4 100644
--- a/api/cli/defaults_windows.go
+++ b/api/cli/defaults_windows.go
@@ -4,7 +4,6 @@ const (
 	defaultBindAddress     = ":9000"
 	defaultDataDirectory   = "C:\\data"
 	defaultAssetsDirectory = "."
-	defaultTemplatesURL    = "https://raw.githubusercontent.com/portainer/templates/master/templates.json"
 	defaultNoAuth          = "false"
 	defaultNoAnalytics     = "false"
 	defaultTLSVerify       = "false"
diff --git a/api/cmd/portainer/main.go b/api/cmd/portainer/main.go
index 68c6183fb..9876de6aa 100644
--- a/api/cmd/portainer/main.go
+++ b/api/cmd/portainer/main.go
@@ -82,16 +82,43 @@ func initEndpointWatcher(endpointService portainer.EndpointService, externalEnpo
 	return authorizeEndpointMgmt
 }
 
-func initSettings(authorizeEndpointMgmt bool, flags *portainer.CLIFlags) *portainer.Settings {
-	return &portainer.Settings{
-		HiddenLabels:       *flags.Labels,
-		Logo:               *flags.Logo,
+func initStatus(authorizeEndpointMgmt bool, flags *portainer.CLIFlags) *portainer.Status {
+	return &portainer.Status{
 		Analytics:          !*flags.NoAnalytics,
 		Authentication:     !*flags.NoAuth,
 		EndpointManagement: authorizeEndpointMgmt,
+		Version:            portainer.APIVersion,
 	}
 }
 
+func initSettings(settingsService portainer.SettingsService, flags *portainer.CLIFlags) error {
+	_, err := settingsService.Settings()
+	if err == portainer.ErrSettingsNotFound {
+		settings := &portainer.Settings{
+			LogoURL:                     *flags.Logo,
+			DisplayExternalContributors: true,
+		}
+
+		if *flags.Templates != "" {
+			settings.TemplatesURL = *flags.Templates
+		} else {
+			settings.TemplatesURL = portainer.DefaultTemplatesURL
+		}
+
+		if *flags.Labels != nil {
+			settings.BlackListedLabels = *flags.Labels
+		} else {
+			settings.BlackListedLabels = make([]portainer.Pair, 0)
+		}
+
+		return settingsService.StoreSettings(settings)
+	} else if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func retrieveFirstEndpointFromDatabase(endpointService portainer.EndpointService) *portainer.Endpoint {
 	endpoints, err := endpointService.Endpoints()
 	if err != nil {
@@ -114,7 +141,12 @@ func main() {
 
 	authorizeEndpointMgmt := initEndpointWatcher(store.EndpointService, *flags.ExternalEndpoints, *flags.SyncInterval)
 
-	settings := initSettings(authorizeEndpointMgmt, flags)
+	err := initSettings(store.SettingsService, flags)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	applicationStatus := initStatus(authorizeEndpointMgmt, flags)
 
 	if *flags.Endpoint != "" {
 		var endpoints []portainer.Endpoint
@@ -156,10 +188,9 @@ func main() {
 	}
 
 	var server portainer.Server = &http.Server{
+		Status:                 applicationStatus,
 		BindAddress:            *flags.Addr,
 		AssetsPath:             *flags.Assets,
-		Settings:               settings,
-		TemplatesURL:           *flags.Templates,
 		AuthDisabled:           *flags.NoAuth,
 		EndpointManagement:     authorizeEndpointMgmt,
 		UserService:            store.UserService,
@@ -167,6 +198,7 @@ func main() {
 		TeamMembershipService:  store.TeamMembershipService,
 		EndpointService:        store.EndpointService,
 		ResourceControlService: store.ResourceControlService,
+		SettingsService:        store.SettingsService,
 		CryptoService:          cryptoService,
 		JWTService:             jwtService,
 		FileService:            fileService,
@@ -176,7 +208,7 @@ func main() {
 	}
 
 	log.Printf("Starting Portainer on %s", *flags.Addr)
-	err := server.Start()
+	err = server.Start()
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/api/errors.go b/api/errors.go
index e22dbc01d..0be2338d8 100644
--- a/api/errors.go
+++ b/api/errors.go
@@ -47,6 +47,11 @@ const (
 	ErrDBVersionNotFound = Error("DB version not found")
 )
 
+// Settings errors.
+const (
+	ErrSettingsNotFound = Error("Settings not found")
+)
+
 // Crypto errors.
 const (
 	ErrCryptoHashFailure = Error("Unable to hash data")
diff --git a/api/http/handler/handler.go b/api/http/handler/handler.go
index 89a963c33..0692dc6de 100644
--- a/api/http/handler/handler.go
+++ b/api/http/handler/handler.go
@@ -18,6 +18,7 @@ type Handler struct {
 	TeamMembershipHandler *TeamMembershipHandler
 	EndpointHandler       *EndpointHandler
 	ResourceHandler       *ResourceHandler
+	StatusHandler         *StatusHandler
 	SettingsHandler       *SettingsHandler
 	TemplatesHandler      *TemplatesHandler
 	DockerHandler         *DockerHandler
@@ -53,6 +54,8 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		http.StripPrefix("/api", h.ResourceHandler).ServeHTTP(w, r)
 	} else if strings.HasPrefix(r.URL.Path, "/api/settings") {
 		http.StripPrefix("/api", h.SettingsHandler).ServeHTTP(w, r)
+	} else if strings.HasPrefix(r.URL.Path, "/api/status") {
+		http.StripPrefix("/api", h.StatusHandler).ServeHTTP(w, r)
 	} else if strings.HasPrefix(r.URL.Path, "/api/templates") {
 		http.StripPrefix("/api", h.TemplatesHandler).ServeHTTP(w, r)
 	} else if strings.HasPrefix(r.URL.Path, "/api/upload") {
diff --git a/api/http/handler/settings.go b/api/http/handler/settings.go
index cfae1dc30..26e1cfe92 100644
--- a/api/http/handler/settings.go
+++ b/api/http/handler/settings.go
@@ -1,6 +1,9 @@
 package handler
 
 import (
+	"encoding/json"
+
+	"github.com/asaskevich/govalidator"
 	"github.com/portainer/portainer"
 	httperror "github.com/portainer/portainer/http/error"
 	"github.com/portainer/portainer/http/security"
@@ -12,32 +15,69 @@ import (
 	"github.com/gorilla/mux"
 )
 
-// SettingsHandler represents an HTTP API handler for managing settings.
+// SettingsHandler represents an HTTP API handler for managing Settings.
 type SettingsHandler struct {
 	*mux.Router
-	Logger   *log.Logger
-	settings *portainer.Settings
+	Logger          *log.Logger
+	SettingsService portainer.SettingsService
 }
 
-// NewSettingsHandler returns a new instance of SettingsHandler.
-func NewSettingsHandler(bouncer *security.RequestBouncer, settings *portainer.Settings) *SettingsHandler {
+// NewSettingsHandler returns a new instance of OldSettingsHandler.
+func NewSettingsHandler(bouncer *security.RequestBouncer) *SettingsHandler {
 	h := &SettingsHandler{
-		Router:   mux.NewRouter(),
-		Logger:   log.New(os.Stderr, "", log.LstdFlags),
-		settings: settings,
+		Router: mux.NewRouter(),
+		Logger: log.New(os.Stderr, "", log.LstdFlags),
 	}
 	h.Handle("/settings",
-		bouncer.PublicAccess(http.HandlerFunc(h.handleGetSettings)))
+		bouncer.PublicAccess(http.HandlerFunc(h.handleGetSettings))).Methods(http.MethodGet)
+	h.Handle("/settings",
+		bouncer.AdministratorAccess(http.HandlerFunc(h.handlePutSettings))).Methods(http.MethodPut)
 
 	return h
 }
 
 // handleGetSettings handles GET requests on /settings
 func (handler *SettingsHandler) handleGetSettings(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodGet {
-		httperror.WriteMethodNotAllowedResponse(w, []string{http.MethodGet})
+	settings, err := handler.SettingsService.Settings()
+	if err != nil {
+		httperror.WriteErrorResponse(w, err, http.StatusInternalServerError, handler.Logger)
 		return
 	}
 
-	encodeJSON(w, handler.settings, handler.Logger)
+	encodeJSON(w, settings, handler.Logger)
+	return
+}
+
+// handlePutSettings handles PUT requests on /settings
+func (handler *SettingsHandler) handlePutSettings(w http.ResponseWriter, r *http.Request) {
+	var req putSettingsRequest
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		httperror.WriteErrorResponse(w, ErrInvalidJSON, http.StatusBadRequest, handler.Logger)
+		return
+	}
+
+	_, err := govalidator.ValidateStruct(req)
+	if err != nil {
+		httperror.WriteErrorResponse(w, ErrInvalidRequestFormat, http.StatusBadRequest, handler.Logger)
+		return
+	}
+
+	settings := &portainer.Settings{
+		TemplatesURL:                req.TemplatesURL,
+		LogoURL:                     req.LogoURL,
+		BlackListedLabels:           req.BlackListedLabels,
+		DisplayExternalContributors: req.DisplayExternalContributors,
+	}
+
+	err = handler.SettingsService.StoreSettings(settings)
+	if err != nil {
+		httperror.WriteErrorResponse(w, err, http.StatusInternalServerError, handler.Logger)
+	}
+}
+
+type putSettingsRequest struct {
+	TemplatesURL                string           `valid:"required"`
+	LogoURL                     string           `valid:""`
+	BlackListedLabels           []portainer.Pair `valid:""`
+	DisplayExternalContributors bool             `valid:""`
 }
diff --git a/api/http/handler/status.go b/api/http/handler/status.go
new file mode 100644
index 000000000..6bae3c8a7
--- /dev/null
+++ b/api/http/handler/status.go
@@ -0,0 +1,38 @@
+package handler
+
+import (
+	"github.com/portainer/portainer"
+	"github.com/portainer/portainer/http/security"
+
+	"log"
+	"net/http"
+	"os"
+
+	"github.com/gorilla/mux"
+)
+
+// StatusHandler represents an HTTP API handler for managing Status.
+type StatusHandler struct {
+	*mux.Router
+	Logger *log.Logger
+	Status *portainer.Status
+}
+
+// NewStatusHandler returns a new instance of StatusHandler.
+func NewStatusHandler(bouncer *security.RequestBouncer, status *portainer.Status) *StatusHandler {
+	h := &StatusHandler{
+		Router: mux.NewRouter(),
+		Logger: log.New(os.Stderr, "", log.LstdFlags),
+		Status: status,
+	}
+	h.Handle("/status",
+		bouncer.PublicAccess(http.HandlerFunc(h.handleGetStatus))).Methods(http.MethodGet)
+
+	return h
+}
+
+// handleGetStatus handles GET requests on /status
+func (handler *StatusHandler) handleGetStatus(w http.ResponseWriter, r *http.Request) {
+	encodeJSON(w, handler.Status, handler.Logger)
+	return
+}
diff --git a/api/http/handler/templates.go b/api/http/handler/templates.go
index 9383e407e..516fc892e 100644
--- a/api/http/handler/templates.go
+++ b/api/http/handler/templates.go
@@ -7,6 +7,7 @@ import (
 	"os"
 
 	"github.com/gorilla/mux"
+	"github.com/portainer/portainer"
 	httperror "github.com/portainer/portainer/http/error"
 	"github.com/portainer/portainer/http/security"
 )
@@ -14,8 +15,8 @@ import (
 // TemplatesHandler represents an HTTP API handler for managing templates.
 type TemplatesHandler struct {
 	*mux.Router
-	Logger                *log.Logger
-	containerTemplatesURL string
+	Logger          *log.Logger
+	SettingsService portainer.SettingsService
 }
 
 const (
@@ -23,11 +24,10 @@ const (
 )
 
 // NewTemplatesHandler returns a new instance of TemplatesHandler.
-func NewTemplatesHandler(bouncer *security.RequestBouncer, containerTemplatesURL string) *TemplatesHandler {
+func NewTemplatesHandler(bouncer *security.RequestBouncer) *TemplatesHandler {
 	h := &TemplatesHandler{
-		Router:                mux.NewRouter(),
-		Logger:                log.New(os.Stderr, "", log.LstdFlags),
-		containerTemplatesURL: containerTemplatesURL,
+		Router: mux.NewRouter(),
+		Logger: log.New(os.Stderr, "", log.LstdFlags),
 	}
 	h.Handle("/templates",
 		bouncer.AuthenticatedAccess(http.HandlerFunc(h.handleGetTemplates)))
@@ -49,7 +49,12 @@ func (handler *TemplatesHandler) handleGetTemplates(w http.ResponseWriter, r *ht
 
 	var templatesURL string
 	if key == "containers" {
-		templatesURL = handler.containerTemplatesURL
+		settings, err := handler.SettingsService.Settings()
+		if err != nil {
+			httperror.WriteErrorResponse(w, err, http.StatusInternalServerError, handler.Logger)
+			return
+		}
+		templatesURL = settings.TemplatesURL
 	} else if key == "linuxserver.io" {
 		templatesURL = containerTemplatesURLLinuxServerIo
 	} else {
diff --git a/api/http/proxy/containers.go b/api/http/proxy/containers.go
index 909a7dc0d..964dab1f6 100644
--- a/api/http/proxy/containers.go
+++ b/api/http/proxy/containers.go
@@ -15,7 +15,7 @@ const (
 
 // containerListOperation extracts the response as a JSON object, loop through the containers array
 // decorate and/or filter the containers based on resource controls before rewriting the response
-func containerListOperation(request *http.Request, response *http.Response, operationContext *restrictedOperationContext) error {
+func containerListOperation(request *http.Request, response *http.Response, executor *operationExecutor) error {
 	var err error
 	// ContainerList response is a JSON array
 	// https://docs.docker.com/engine/api/v1.28/#operation/ContainerList
@@ -24,22 +24,30 @@ func containerListOperation(request *http.Request, response *http.Response, oper
 		return err
 	}
 
-	if operationContext.isAdmin {
-		responseArray, err = decorateContainerList(responseArray, operationContext.resourceControls)
+	if executor.operationContext.isAdmin {
+		responseArray, err = decorateContainerList(responseArray, executor.operationContext.resourceControls)
 	} else {
-		responseArray, err = filterContainerList(responseArray, operationContext.resourceControls, operationContext.userID, operationContext.userTeamIDs)
+		responseArray, err = filterContainerList(responseArray, executor.operationContext.resourceControls,
+			executor.operationContext.userID, executor.operationContext.userTeamIDs)
 	}
 	if err != nil {
 		return err
 	}
 
+	if executor.labelBlackList != nil {
+		responseArray, err = filterContainersWithBlackListedLabels(responseArray, executor.labelBlackList)
+		if err != nil {
+			return err
+		}
+	}
+
 	return rewriteResponse(response, responseArray, http.StatusOK)
 }
 
 // containerInspectOperation extracts the response as a JSON object, verify that the user
 // has access to the container based on resource control (check are done based on the containerID and optional Swarm service ID)
 // and either rewrite an access denied response or a decorated container.
-func containerInspectOperation(request *http.Request, response *http.Response, operationContext *restrictedOperationContext) error {
+func containerInspectOperation(request *http.Request, response *http.Response, executor *operationExecutor) error {
 	// ContainerInspect response is a JSON object
 	// https://docs.docker.com/engine/api/v1.28/#operation/ContainerInspect
 	responseObject, err := getResponseAsJSONOBject(response)
@@ -52,9 +60,10 @@ func containerInspectOperation(request *http.Request, response *http.Response, o
 	}
 	containerID := responseObject[containerIdentifier].(string)
 
-	resourceControl := getResourceControlByResourceID(containerID, operationContext.resourceControls)
+	resourceControl := getResourceControlByResourceID(containerID, executor.operationContext.resourceControls)
 	if resourceControl != nil {
-		if operationContext.isAdmin || canUserAccessResource(operationContext.userID, operationContext.userTeamIDs, resourceControl) {
+		if executor.operationContext.isAdmin || canUserAccessResource(executor.operationContext.userID,
+			executor.operationContext.userTeamIDs, resourceControl) {
 			responseObject = decorateObject(responseObject, resourceControl)
 		} else {
 			return rewriteAccessDeniedResponse(response)
@@ -64,9 +73,10 @@ func containerInspectOperation(request *http.Request, response *http.Response, o
 	containerLabels := extractContainerLabelsFromContainerInspectObject(responseObject)
 	if containerLabels != nil && containerLabels[containerLabelForServiceIdentifier] != nil {
 		serviceID := containerLabels[containerLabelForServiceIdentifier].(string)
-		resourceControl := getResourceControlByResourceID(serviceID, operationContext.resourceControls)
+		resourceControl := getResourceControlByResourceID(serviceID, executor.operationContext.resourceControls)
 		if resourceControl != nil {
-			if operationContext.isAdmin || canUserAccessResource(operationContext.userID, operationContext.userTeamIDs, resourceControl) {
+			if executor.operationContext.isAdmin || canUserAccessResource(executor.operationContext.userID,
+				executor.operationContext.userTeamIDs, resourceControl) {
 				responseObject = decorateObject(responseObject, resourceControl)
 			} else {
 				return rewriteAccessDeniedResponse(response)
diff --git a/api/http/proxy/factory.go b/api/http/proxy/factory.go
index 96d2239d2..3e0d71445 100644
--- a/api/http/proxy/factory.go
+++ b/api/http/proxy/factory.go
@@ -13,6 +13,7 @@ import (
 type proxyFactory struct {
 	ResourceControlService portainer.ResourceControlService
 	TeamMembershipService  portainer.TeamMembershipService
+	SettingsService        portainer.SettingsService
 }
 
 func (factory *proxyFactory) newHTTPProxy(u *url.URL) http.Handler {
@@ -37,6 +38,7 @@ func (factory *proxyFactory) newSocketProxy(path string) http.Handler {
 	transport := &proxyTransport{
 		ResourceControlService: factory.ResourceControlService,
 		TeamMembershipService:  factory.TeamMembershipService,
+		SettingsService:        factory.SettingsService,
 		dockerTransport:        newSocketTransport(path),
 	}
 	proxy.Transport = transport
@@ -48,6 +50,7 @@ func (factory *proxyFactory) createReverseProxy(u *url.URL) *httputil.ReversePro
 	transport := &proxyTransport{
 		ResourceControlService: factory.ResourceControlService,
 		TeamMembershipService:  factory.TeamMembershipService,
+		SettingsService:        factory.SettingsService,
 		dockerTransport:        newHTTPTransport(),
 	}
 	proxy.Transport = transport
diff --git a/api/http/proxy/filter.go b/api/http/proxy/filter.go
index 02de684b3..0e66ab4fd 100644
--- a/api/http/proxy/filter.go
+++ b/api/http/proxy/filter.go
@@ -65,6 +65,27 @@ func filterContainerList(containerData []interface{}, resourceControls []portain
 	return filteredContainerData, nil
 }
 
+// filterContainersWithLabels loops through a list of containers, and filters containers that do not contains
+// any labels in the labels black list.
+func filterContainersWithBlackListedLabels(containerData []interface{}, labelBlackList []portainer.Pair) ([]interface{}, error) {
+	filteredContainerData := make([]interface{}, 0)
+
+	for _, container := range containerData {
+		containerObject := container.(map[string]interface{})
+
+		containerLabels := extractContainerLabelsFromContainerListObject(containerObject)
+		if containerLabels != nil {
+			if !containerHasBlackListedLabel(containerLabels, labelBlackList) {
+				filteredContainerData = append(filteredContainerData, containerObject)
+			}
+		} else {
+			filteredContainerData = append(filteredContainerData, containerObject)
+		}
+	}
+
+	return filteredContainerData, nil
+}
+
 // filterServiceList loops through all services, filters services without any resource control (public resources) or with
 // any resource control giving access to the user (these services will be decorated).
 // Service object schema reference: https://docs.docker.com/engine/api/v1.28/#operation/ServiceList
diff --git a/api/http/proxy/manager.go b/api/http/proxy/manager.go
index b90596e10..8710c7a44 100644
--- a/api/http/proxy/manager.go
+++ b/api/http/proxy/manager.go
@@ -15,12 +15,13 @@ type Manager struct {
 }
 
 // NewManager initializes a new proxy Service
-func NewManager(resourceControlService portainer.ResourceControlService, teamMembershipService portainer.TeamMembershipService) *Manager {
+func NewManager(resourceControlService portainer.ResourceControlService, teamMembershipService portainer.TeamMembershipService, settingsService portainer.SettingsService) *Manager {
 	return &Manager{
 		proxies: cmap.New(),
 		proxyFactory: &proxyFactory{
 			ResourceControlService: resourceControlService,
 			TeamMembershipService:  teamMembershipService,
+			SettingsService:        settingsService,
 		},
 	}
 }
diff --git a/api/http/proxy/service.go b/api/http/proxy/service.go
index fcf604a84..317da9ebc 100644
--- a/api/http/proxy/service.go
+++ b/api/http/proxy/service.go
@@ -14,7 +14,7 @@ const (
 
 // serviceListOperation extracts the response as a JSON array, loop through the service array
 // decorate and/or filter the services based on resource controls before rewriting the response
-func serviceListOperation(request *http.Request, response *http.Response, operationContext *restrictedOperationContext) error {
+func serviceListOperation(request *http.Request, response *http.Response, executor *operationExecutor) error {
 	var err error
 	// ServiceList response is a JSON array
 	// https://docs.docker.com/engine/api/v1.28/#operation/ServiceList
@@ -23,10 +23,10 @@ func serviceListOperation(request *http.Request, response *http.Response, operat
 		return err
 	}
 
-	if operationContext.isAdmin {
-		responseArray, err = decorateServiceList(responseArray, operationContext.resourceControls)
+	if executor.operationContext.isAdmin {
+		responseArray, err = decorateServiceList(responseArray, executor.operationContext.resourceControls)
 	} else {
-		responseArray, err = filterServiceList(responseArray, operationContext.resourceControls, operationContext.userID, operationContext.userTeamIDs)
+		responseArray, err = filterServiceList(responseArray, executor.operationContext.resourceControls, executor.operationContext.userID, executor.operationContext.userTeamIDs)
 	}
 	if err != nil {
 		return err
@@ -38,7 +38,7 @@ func serviceListOperation(request *http.Request, response *http.Response, operat
 // serviceInspectOperation extracts the response as a JSON object, verify that the user
 // has access to the service based on resource control and either rewrite an access denied response
 // or a decorated service.
-func serviceInspectOperation(request *http.Request, response *http.Response, operationContext *restrictedOperationContext) error {
+func serviceInspectOperation(request *http.Request, response *http.Response, executor *operationExecutor) error {
 	// ServiceInspect response is a JSON object
 	// https://docs.docker.com/engine/api/v1.28/#operation/ServiceInspect
 	responseObject, err := getResponseAsJSONOBject(response)
@@ -51,9 +51,9 @@ func serviceInspectOperation(request *http.Request, response *http.Response, ope
 	}
 	serviceID := responseObject[serviceIdentifier].(string)
 
-	resourceControl := getResourceControlByResourceID(serviceID, operationContext.resourceControls)
+	resourceControl := getResourceControlByResourceID(serviceID, executor.operationContext.resourceControls)
 	if resourceControl != nil {
-		if operationContext.isAdmin || canUserAccessResource(operationContext.userID, operationContext.userTeamIDs, resourceControl) {
+		if executor.operationContext.isAdmin || canUserAccessResource(executor.operationContext.userID, executor.operationContext.userTeamIDs, resourceControl) {
 			responseObject = decorateObject(responseObject, resourceControl)
 		} else {
 			return rewriteAccessDeniedResponse(response)
diff --git a/api/http/proxy/transport.go b/api/http/proxy/transport.go
index ca18ebcb5..29c1d6c72 100644
--- a/api/http/proxy/transport.go
+++ b/api/http/proxy/transport.go
@@ -15,6 +15,7 @@ type (
 		dockerTransport        *http.Transport
 		ResourceControlService portainer.ResourceControlService
 		TeamMembershipService  portainer.TeamMembershipService
+		SettingsService        portainer.SettingsService
 	}
 	restrictedOperationContext struct {
 		isAdmin          bool
@@ -22,7 +23,11 @@ type (
 		userTeamIDs      []portainer.TeamID
 		resourceControls []portainer.ResourceControl
 	}
-	restrictedOperationRequest func(*http.Request, *http.Response, *restrictedOperationContext) error
+	operationExecutor struct {
+		operationContext *restrictedOperationContext
+		labelBlackList   []portainer.Pair
+	}
+	restrictedOperationRequest func(*http.Request, *http.Response, *operationExecutor) error
 )
 
 func newSocketTransport(socketPath string) *http.Transport {
@@ -60,7 +65,6 @@ func (p *proxyTransport) proxyDockerRequest(request *http.Request) (*http.Respon
 }
 
 func (p *proxyTransport) proxyContainerRequest(request *http.Request) (*http.Response, error) {
-	// return p.executeDockerRequest(request)
 	switch requestPath := request.URL.Path; requestPath {
 	case "/containers/create":
 		return p.executeDockerRequest(request)
@@ -69,7 +73,7 @@ func (p *proxyTransport) proxyContainerRequest(request *http.Request) (*http.Res
 		return p.administratorOperation(request)
 
 	case "/containers/json":
-		return p.rewriteOperation(request, containerListOperation)
+		return p.rewriteOperationWithLabelFiltering(request, containerListOperation)
 
 	default:
 		// This section assumes /containers/**
@@ -96,9 +100,6 @@ func (p *proxyTransport) proxyServiceRequest(request *http.Request) (*http.Respo
 	case "/services/create":
 		return p.executeDockerRequest(request)
 
-	case "/volumes/prune":
-		return p.administratorOperation(request)
-
 	case "/services":
 		return p.rewriteOperation(request, serviceListOperation)
 
@@ -177,9 +178,69 @@ func (p *proxyTransport) restrictedOperation(request *http.Request, resourceID s
 	return p.executeDockerRequest(request)
 }
 
+// rewriteOperation will create a new operation context with data that will be used
+// to decorate the original request's response as well as retrieve all the black listed labels
+// to filter the resources.
+func (p *proxyTransport) rewriteOperationWithLabelFiltering(request *http.Request, operation restrictedOperationRequest) (*http.Response, error) {
+	operationContext, err := p.createOperationContext(request)
+	if err != nil {
+		return nil, err
+	}
+
+	settings, err := p.SettingsService.Settings()
+	if err != nil {
+		return nil, err
+	}
+
+	executor := &operationExecutor{
+		operationContext: operationContext,
+		labelBlackList:   settings.BlackListedLabels,
+	}
+
+	return p.executeRequestAndRewriteResponse(request, operation, executor)
+}
+
 // rewriteOperation will create a new operation context with data that will be used
 // to decorate the original request's response.
 func (p *proxyTransport) rewriteOperation(request *http.Request, operation restrictedOperationRequest) (*http.Response, error) {
+	operationContext, err := p.createOperationContext(request)
+	if err != nil {
+		return nil, err
+	}
+
+	executor := &operationExecutor{
+		operationContext: operationContext,
+	}
+
+	return p.executeRequestAndRewriteResponse(request, operation, executor)
+}
+
+func (p *proxyTransport) executeRequestAndRewriteResponse(request *http.Request, operation restrictedOperationRequest, executor *operationExecutor) (*http.Response, error) {
+	response, err := p.executeDockerRequest(request)
+	if err != nil {
+		return response, err
+	}
+
+	err = operation(request, response, executor)
+	return response, err
+}
+
+// administratorOperation ensures that the user has administrator privileges
+// before executing the original request.
+func (p *proxyTransport) administratorOperation(request *http.Request) (*http.Response, error) {
+	tokenData, err := security.RetrieveTokenData(request)
+	if err != nil {
+		return nil, err
+	}
+
+	if tokenData.Role != portainer.AdministratorRole {
+		return writeAccessDeniedResponse()
+	}
+
+	return p.executeDockerRequest(request)
+}
+
+func (p *proxyTransport) createOperationContext(request *http.Request) (*restrictedOperationContext, error) {
 	var err error
 	tokenData, err := security.RetrieveTokenData(request)
 	if err != nil {
@@ -212,26 +273,5 @@ func (p *proxyTransport) rewriteOperation(request *http.Request, operation restr
 		operationContext.userTeamIDs = userTeamIDs
 	}
 
-	response, err := p.executeDockerRequest(request)
-	if err != nil {
-		return response, err
-	}
-
-	err = operation(request, response, operationContext)
-	return response, err
-}
-
-// administratorOperation ensures that the user has administrator privileges
-// before executing the original request.
-func (p *proxyTransport) administratorOperation(request *http.Request) (*http.Response, error) {
-	tokenData, err := security.RetrieveTokenData(request)
-	if err != nil {
-		return nil, err
-	}
-
-	if tokenData.Role != portainer.AdministratorRole {
-		return writeAccessDeniedResponse()
-	}
-
-	return p.executeDockerRequest(request)
+	return operationContext, nil
 }
diff --git a/api/http/proxy/utils.go b/api/http/proxy/utils.go
index 36afce97d..7f85a624a 100644
--- a/api/http/proxy/utils.go
+++ b/api/http/proxy/utils.go
@@ -15,3 +15,18 @@ func getResourceControlByResourceID(resourceID string, resourceControls []portai
 	}
 	return nil
 }
+
+func containerHasBlackListedLabel(containerLabels map[string]interface{}, labelBlackList []portainer.Pair) bool {
+	for key, value := range containerLabels {
+		labelName := key
+		labelValue := value.(string)
+
+		for _, blackListedLabel := range labelBlackList {
+			if blackListedLabel.Name == labelName && blackListedLabel.Value == labelValue {
+				return true
+			}
+		}
+	}
+
+	return false
+}
diff --git a/api/http/proxy/volumes.go b/api/http/proxy/volumes.go
index c39805de8..ce451c0e2 100644
--- a/api/http/proxy/volumes.go
+++ b/api/http/proxy/volumes.go
@@ -14,7 +14,7 @@ const (
 
 // volumeListOperation extracts the response as a JSON object, loop through the volume array
 // decorate and/or filter the volumes based on resource controls before rewriting the response
-func volumeListOperation(request *http.Request, response *http.Response, operationContext *restrictedOperationContext) error {
+func volumeListOperation(request *http.Request, response *http.Response, executor *operationExecutor) error {
 	var err error
 	// VolumeList response is a JSON object
 	// https://docs.docker.com/engine/api/v1.28/#operation/VolumeList
@@ -28,10 +28,10 @@ func volumeListOperation(request *http.Request, response *http.Response, operati
 	if responseObject["Volumes"] != nil {
 		volumeData := responseObject["Volumes"].([]interface{})
 
-		if operationContext.isAdmin {
-			volumeData, err = decorateVolumeList(volumeData, operationContext.resourceControls)
+		if executor.operationContext.isAdmin {
+			volumeData, err = decorateVolumeList(volumeData, executor.operationContext.resourceControls)
 		} else {
-			volumeData, err = filterVolumeList(volumeData, operationContext.resourceControls, operationContext.userID, operationContext.userTeamIDs)
+			volumeData, err = filterVolumeList(volumeData, executor.operationContext.resourceControls, executor.operationContext.userID, executor.operationContext.userTeamIDs)
 		}
 		if err != nil {
 			return err
@@ -47,7 +47,7 @@ func volumeListOperation(request *http.Request, response *http.Response, operati
 // volumeInspectOperation extracts the response as a JSON object, verify that the user
 // has access to the volume based on resource control and either rewrite an access denied response
 // or a decorated volume.
-func volumeInspectOperation(request *http.Request, response *http.Response, operationContext *restrictedOperationContext) error {
+func volumeInspectOperation(request *http.Request, response *http.Response, executor *operationExecutor) error {
 	// VolumeInspect response is a JSON object
 	// https://docs.docker.com/engine/api/v1.28/#operation/VolumeInspect
 	responseObject, err := getResponseAsJSONOBject(response)
@@ -60,9 +60,9 @@ func volumeInspectOperation(request *http.Request, response *http.Response, oper
 	}
 	volumeID := responseObject[volumeIdentifier].(string)
 
-	resourceControl := getResourceControlByResourceID(volumeID, operationContext.resourceControls)
+	resourceControl := getResourceControlByResourceID(volumeID, executor.operationContext.resourceControls)
 	if resourceControl != nil {
-		if operationContext.isAdmin || canUserAccessResource(operationContext.userID, operationContext.userTeamIDs, resourceControl) {
+		if executor.operationContext.isAdmin || canUserAccessResource(executor.operationContext.userID, executor.operationContext.userTeamIDs, resourceControl) {
 			responseObject = decorateObject(responseObject, resourceControl)
 		} else {
 			return rewriteAccessDeniedResponse(response)
diff --git a/api/http/server.go b/api/http/server.go
index 11d126d33..c183e81a5 100644
--- a/api/http/server.go
+++ b/api/http/server.go
@@ -15,16 +15,16 @@ type Server struct {
 	AssetsPath             string
 	AuthDisabled           bool
 	EndpointManagement     bool
+	Status                 *portainer.Status
 	UserService            portainer.UserService
 	TeamService            portainer.TeamService
 	TeamMembershipService  portainer.TeamMembershipService
 	EndpointService        portainer.EndpointService
 	ResourceControlService portainer.ResourceControlService
+	SettingsService        portainer.SettingsService
 	CryptoService          portainer.CryptoService
 	JWTService             portainer.JWTService
 	FileService            portainer.FileService
-	Settings               *portainer.Settings
-	TemplatesURL           string
 	Handler                *handler.Handler
 	SSL                    bool
 	SSLCert                string
@@ -34,7 +34,7 @@ type Server struct {
 // Start starts the HTTP server
 func (server *Server) Start() error {
 	requestBouncer := security.NewRequestBouncer(server.JWTService, server.TeamMembershipService, server.AuthDisabled)
-	proxyManager := proxy.NewManager(server.ResourceControlService, server.TeamMembershipService)
+	proxyManager := proxy.NewManager(server.ResourceControlService, server.TeamMembershipService, server.SettingsService)
 
 	var authHandler = handler.NewAuthHandler(requestBouncer, server.AuthDisabled)
 	authHandler.UserService = server.UserService
@@ -51,8 +51,11 @@ func (server *Server) Start() error {
 	teamHandler.TeamMembershipService = server.TeamMembershipService
 	var teamMembershipHandler = handler.NewTeamMembershipHandler(requestBouncer)
 	teamMembershipHandler.TeamMembershipService = server.TeamMembershipService
-	var settingsHandler = handler.NewSettingsHandler(requestBouncer, server.Settings)
-	var templatesHandler = handler.NewTemplatesHandler(requestBouncer, server.TemplatesURL)
+	var statusHandler = handler.NewStatusHandler(requestBouncer, server.Status)
+	var settingsHandler = handler.NewSettingsHandler(requestBouncer)
+	settingsHandler.SettingsService = server.SettingsService
+	var templatesHandler = handler.NewTemplatesHandler(requestBouncer)
+	templatesHandler.SettingsService = server.SettingsService
 	var dockerHandler = handler.NewDockerHandler(requestBouncer)
 	dockerHandler.EndpointService = server.EndpointService
 	dockerHandler.TeamMembershipService = server.TeamMembershipService
@@ -77,6 +80,7 @@ func (server *Server) Start() error {
 		EndpointHandler:       endpointHandler,
 		ResourceHandler:       resourceHandler,
 		SettingsHandler:       settingsHandler,
+		StatusHandler:         statusHandler,
 		TemplatesHandler:      templatesHandler,
 		DockerHandler:         dockerHandler,
 		WebSocketHandler:      websocketHandler,
diff --git a/api/portainer.go b/api/portainer.go
index c0315ecaf..7051588dd 100644
--- a/api/portainer.go
+++ b/api/portainer.go
@@ -17,9 +17,6 @@ type (
 		ExternalEndpoints *string
 		SyncInterval      *string
 		Endpoint          *string
-		Labels            *[]Pair
-		Logo              *string
-		Templates         *string
 		NoAuth            *bool
 		NoAnalytics       *bool
 		TLSVerify         *bool
@@ -30,15 +27,26 @@ type (
 		SSLCert           *string
 		SSLKey            *string
 		AdminPassword     *string
+		// Deprecated fields
+		Logo      *string
+		Templates *string
+		Labels    *[]Pair
 	}
 
-	// Settings represents Portainer settings.
+	// Status represents the application status.
+	Status struct {
+		Authentication     bool   `json:"Authentication"`
+		EndpointManagement bool   `json:"EndpointManagement"`
+		Analytics          bool   `json:"Analytics"`
+		Version            string `json:"Version"`
+	}
+
+	// Settings represents the application settings.
 	Settings struct {
-		HiddenLabels       []Pair `json:"hiddenLabels"`
-		Logo               string `json:"logo"`
-		Authentication     bool   `json:"authentication"`
-		Analytics          bool   `json:"analytics"`
-		EndpointManagement bool   `json:"endpointManagement"`
+		TemplatesURL                string `json:"TemplatesURL"`
+		LogoURL                     string `json:"LogoURL"`
+		BlackListedLabels           []Pair `json:"BlackListedLabels"`
+		DisplayExternalContributors bool   `json:"DisplayExternalContributors"`
 	}
 
 	// User represents a user account.
@@ -209,6 +217,12 @@ type (
 		Synchronize(toCreate, toUpdate, toDelete []*Endpoint) error
 	}
 
+	// SettingsService represents a service for managing application settings.
+	SettingsService interface {
+		Settings() (*Settings, error)
+		StoreSettings(settings *Settings) error
+	}
+
 	// VersionService represents a service for managing version data.
 	VersionService interface {
 		DBVersion() (int, error)
@@ -255,6 +269,8 @@ const (
 	APIVersion = "1.13.1"
 	// DBVersion is the version number of the Portainer database.
 	DBVersion = 2
+	// DefaultTemplatesURL represents the default URL for the templates definitions.
+	DefaultTemplatesURL = "https://raw.githubusercontent.com/portainer/templates/master/templates.json"
 )
 
 const (
diff --git a/app/app.js b/app/app.js
index 513743c75..ddb5bd587 100644
--- a/app/app.js
+++ b/app/app.js
@@ -57,6 +57,7 @@ angular.module('portainer', [
   'templates',
   'user',
   'users',
+  'userSettings',
   'volume',
   'volumes'])
   .config(['$stateProvider', '$urlRouterProvider', '$httpProvider', 'localStorageServiceProvider', 'jwtOptionsProvider', 'AnalyticsProvider', '$uibTooltipProvider', '$compileProvider', function ($stateProvider, $urlRouterProvider, $httpProvider, localStorageServiceProvider, jwtOptionsProvider, AnalyticsProvider, $uibTooltipProvider, $compileProvider) {
@@ -594,6 +595,19 @@ angular.module('portainer', [
         }
       }
     })
+    .state('userSettings', {
+      url: '/userSettings/',
+      views: {
+        'content@': {
+          templateUrl: 'app/components/userSettings/userSettings.html',
+          controller: 'UserSettingsController'
+        },
+        'sidebar@': {
+          templateUrl: 'app/components/sidebar/sidebar.html',
+          controller: 'SidebarController'
+        }
+      }
+    })
     .state('teams', {
       url: '/teams/',
       views: {
@@ -662,9 +676,11 @@ angular.module('portainer', [
   }])
   // This is your docker url that the api will use to make requests
   // You need to set this to the api endpoint without the port i.e. http://192.168.1.9
-  .constant('DOCKER_PORT', '') // Docker port, leave as an empty string if no port is required.  If you have a port, prefix it with a ':' i.e. :4243
+  // .constant('DOCKER_PORT', '') // Docker port, leave as an empty string if no port is required.  If you have a port, prefix it with a ':' i.e. :4243
   .constant('DOCKER_ENDPOINT', 'api/docker')
-  .constant('CONFIG_ENDPOINT', 'api/settings')
+  .constant('CONFIG_ENDPOINT', 'api/old_settings')
+  .constant('SETTINGS_ENDPOINT', 'api/settings')
+  .constant('STATUS_ENDPOINT', 'api/status')
   .constant('AUTH_ENDPOINT', 'api/auth')
   .constant('USERS_ENDPOINT', 'api/users')
   .constant('TEAMS_ENDPOINT', 'api/teams')
@@ -672,5 +688,6 @@ angular.module('portainer', [
   .constant('RESOURCE_CONTROL_ENDPOINT', 'api/resource_controls')
   .constant('ENDPOINTS_ENDPOINT', 'api/endpoints')
   .constant('TEMPLATES_ENDPOINT', 'api/templates')
-  .constant('PAGINATION_MAX_ITEMS', 10)
-  .constant('UI_VERSION', 'v1.13.1');
+  .constant('DEFAULT_TEMPLATES_URL', 'https://raw.githubusercontent.com/portainer/templates/master/templates.json')
+  .constant('PAGINATION_MAX_ITEMS', 10);
+  // .constant('UI_VERSION', 'v1.13.1');
diff --git a/app/components/auth/authController.js b/app/components/auth/authController.js
index d6edeff95..14ef479d7 100644
--- a/app/components/auth/authController.js
+++ b/app/components/auth/authController.js
@@ -1,6 +1,6 @@
 angular.module('auth', [])
-.controller('AuthenticationController', ['$scope', '$state', '$stateParams', '$window', '$timeout', '$sanitize', 'Config', 'Authentication', 'Users', 'EndpointService', 'StateManager', 'EndpointProvider', 'Notifications',
-function ($scope, $state, $stateParams, $window, $timeout, $sanitize, Config, Authentication, Users, EndpointService, StateManager, EndpointProvider, Notifications) {
+.controller('AuthenticationController', ['$scope', '$state', '$stateParams', '$window', '$timeout', '$sanitize', 'Authentication', 'Users', 'EndpointService', 'StateManager', 'EndpointProvider', 'Notifications',
+function ($scope, $state, $stateParams, $window, $timeout, $sanitize, Authentication, Users, EndpointService, StateManager, EndpointProvider, Notifications) {
 
   $scope.authData = {
     username: 'admin',
@@ -13,6 +13,8 @@ function ($scope, $state, $stateParams, $window, $timeout, $sanitize, Config, Au
     error: false
   };
 
+  $scope.logo = StateManager.getState().application.logo;
+
   if (!$scope.applicationState.application.authentication) {
     EndpointService.endpoints()
     .then(function success(data) {
@@ -59,10 +61,6 @@ function ($scope, $state, $stateParams, $window, $timeout, $sanitize, Config, Au
     $state.go('dashboard');
   }
 
-  Config.$promise.then(function (c) {
-    $scope.logo = c.logo;
-  });
-
   $scope.createAdminUser = function() {
     var password = $sanitize($scope.initPasswordData.password);
     Users.initAdminUser({password: password}, function (d) {
diff --git a/app/components/containerConsole/containerConsoleController.js b/app/components/containerConsole/containerConsoleController.js
index d00881c6f..b9da6c20f 100644
--- a/app/components/containerConsole/containerConsoleController.js
+++ b/app/components/containerConsole/containerConsoleController.js
@@ -1,6 +1,6 @@
 angular.module('containerConsole', [])
-.controller('ContainerConsoleController', ['$scope', '$stateParams', 'Settings', 'Container', 'Image', 'Exec', '$timeout', 'EndpointProvider', 'Notifications',
-function ($scope, $stateParams, Settings, Container, Image, Exec, $timeout, EndpointProvider, Notifications) {
+.controller('ContainerConsoleController', ['$scope', '$stateParams', 'Container', 'Image', 'Exec', '$timeout', 'EndpointProvider', 'Notifications',
+function ($scope, $stateParams, Container, Image, Exec, $timeout, EndpointProvider, Notifications) {
   $scope.state = {};
   $scope.state.loaded = false;
   $scope.state.connected = false;
diff --git a/app/components/containers/containersController.js b/app/components/containers/containersController.js
index 01c50acb9..b3cf31d85 100644
--- a/app/components/containers/containersController.js
+++ b/app/components/containers/containersController.js
@@ -1,9 +1,9 @@
 angular.module('containers', [])
-  .controller('ContainersController', ['$q', '$scope', '$filter', 'Container', 'ContainerService', 'ContainerHelper', 'Info', 'Settings', 'Notifications', 'Config', 'Pagination', 'EntityListService', 'ModalService', 'ResourceControlService', 'EndpointProvider',
-  function ($q, $scope, $filter, Container, ContainerService, ContainerHelper, Info, Settings, Notifications, Config, Pagination, EntityListService, ModalService, ResourceControlService, EndpointProvider) {
+  .controller('ContainersController', ['$q', '$scope', '$filter', 'Container', 'ContainerService', 'ContainerHelper', 'Info', 'Notifications', 'Pagination', 'EntityListService', 'ModalService', 'ResourceControlService', 'EndpointProvider',
+  function ($q, $scope, $filter, Container, ContainerService, ContainerHelper, Info, Notifications, Pagination, EntityListService, ModalService, ResourceControlService, EndpointProvider) {
   $scope.state = {};
   $scope.state.pagination_count = Pagination.getPaginationCount('containers');
-  $scope.state.displayAll = Settings.displayAll;
+  $scope.state.displayAll = true;
   $scope.state.displayIP = false;
   $scope.sortType = 'State';
   $scope.sortReverse = false;
@@ -25,9 +25,6 @@ angular.module('containers', [])
     $scope.state.selectedItemCount = 0;
     Container.query(data, function (d) {
       var containers = d;
-      if ($scope.containersToHideLabels) {
-        containers = ContainerHelper.hideContainers(d, $scope.containersToHideLabels);
-      }
       $scope.containers = containers.map(function (container) {
         var model = new ContainerViewModel(container);
         model.Status = $filter('containerstatus')(model.Status);
@@ -59,7 +56,7 @@ angular.module('containers', [])
       counter = counter - 1;
       if (counter === 0) {
         $('#loadContainersSpinner').hide();
-        update({all: Settings.displayAll ? 1 : 0});
+        update({all: $scope.state.displayAll ? 1 : 0});
       }
     };
     angular.forEach(items, function (c) {
@@ -134,8 +131,7 @@ angular.module('containers', [])
   };
 
   $scope.toggleGetAll = function () {
-    Settings.displayAll = $scope.state.displayAll;
-    update({all: Settings.displayAll ? 1 : 0});
+    update({all: $scope.state.displayAll ? 1 : 0});
   };
 
   $scope.startAction = function () {
@@ -206,15 +202,16 @@ angular.module('containers', [])
     return swarm_hosts;
   }
 
-  Config.$promise.then(function (c) {
-    $scope.containersToHideLabels = c.hiddenLabels;
+  function initView(){
     if ($scope.applicationState.endpoint.mode.provider === 'DOCKER_SWARM') {
       Info.get({}, function (d) {
         $scope.swarm_hosts = retrieveSwarmHostsInfo(d);
-        update({all: Settings.displayAll ? 1 : 0});
+        update({all: $scope.state.displayAll ? 1 : 0});
       });
     } else {
-      update({all: Settings.displayAll ? 1 : 0});
+      update({all: $scope.state.displayAll ? 1 : 0});
     }
-  });
+  }
+
+  initView();
 }]);
diff --git a/app/components/createContainer/createContainerController.js b/app/components/createContainer/createContainerController.js
index 3f8bfe73a..f5375bf1e 100644
--- a/app/components/createContainer/createContainerController.js
+++ b/app/components/createContainer/createContainerController.js
@@ -1,8 +1,8 @@
 // @@OLD_SERVICE_CONTROLLER: this service should be rewritten to use services.
 // See app/components/templates/templatesController.js as a reference.
 angular.module('createContainer', [])
-.controller('CreateContainerController', ['$q', '$scope', '$state', '$stateParams', '$filter', 'Config', 'Info', 'Container', 'ContainerHelper', 'Image', 'ImageHelper', 'Volume', 'Network', 'ResourceControlService', 'Authentication', 'Notifications', 'ContainerService', 'ImageService', 'ControllerDataPipeline', 'FormValidator',
-function ($q, $scope, $state, $stateParams, $filter, Config, Info, Container, ContainerHelper, Image, ImageHelper, Volume, Network, ResourceControlService, Authentication, Notifications, ContainerService, ImageService, ControllerDataPipeline, FormValidator) {
+.controller('CreateContainerController', ['$q', '$scope', '$state', '$stateParams', '$filter', 'Info', 'Container', 'ContainerHelper', 'Image', 'ImageHelper', 'Volume', 'Network', 'ResourceControlService', 'Authentication', 'Notifications', 'ContainerService', 'ImageService', 'ControllerDataPipeline', 'FormValidator',
+function ($q, $scope, $state, $stateParams, $filter, Info, Container, ContainerHelper, Image, ImageHelper, Volume, Network, ResourceControlService, Authentication, Notifications, ContainerService, ImageService, ControllerDataPipeline, FormValidator) {
 
   $scope.formValues = {
     alwaysPull: true,
@@ -233,47 +233,41 @@ function ($q, $scope, $state, $stateParams, $filter, Config, Info, Container, Co
   }
 
   function initView() {
-    Config.$promise.then(function (c) {
-      var containersToHideLabels = c.hiddenLabels;
-
-      Volume.query({}, function (d) {
-        $scope.availableVolumes = d.Volumes;
-      }, function (e) {
-        Notifications.error('Failure', e, 'Unable to retrieve volumes');
-      });
-
-      Network.query({}, function (d) {
-        var networks = d;
-        if ($scope.applicationState.endpoint.mode.provider === 'DOCKER_SWARM' || $scope.applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE') {
-          networks = d.filter(function (network) {
-            if (network.Scope === 'global') {
-              return network;
-            }
-          });
-          $scope.globalNetworkCount = networks.length;
-          networks.push({Name: 'bridge'});
-          networks.push({Name: 'host'});
-          networks.push({Name: 'none'});
-        }
-        networks.push({Name: 'container'});
-        $scope.availableNetworks = networks;
-        if (!_.find(networks, {'Name': 'bridge'})) {
-          $scope.config.HostConfig.NetworkMode = 'nat';
-        }
-      }, function (e) {
-        Notifications.error('Failure', e, 'Unable to retrieve networks');
-      });
-
-      Container.query({}, function (d) {
-        var containers = d;
-        if (containersToHideLabels) {
-          containers = ContainerHelper.hideContainers(d, containersToHideLabels);
-        }
-        $scope.runningContainers = containers;
-      }, function(e) {
-        Notifications.error('Failure', e, 'Unable to retrieve running containers');
-      });
+    Volume.query({}, function (d) {
+      $scope.availableVolumes = d.Volumes;
+    }, function (e) {
+      Notifications.error('Failure', e, 'Unable to retrieve volumes');
     });
+
+    Network.query({}, function (d) {
+      var networks = d;
+      if ($scope.applicationState.endpoint.mode.provider === 'DOCKER_SWARM' || $scope.applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE') {
+        networks = d.filter(function (network) {
+          if (network.Scope === 'global') {
+            return network;
+          }
+        });
+        $scope.globalNetworkCount = networks.length;
+        networks.push({Name: 'bridge'});
+        networks.push({Name: 'host'});
+        networks.push({Name: 'none'});
+      }
+      networks.push({Name: 'container'});
+      $scope.availableNetworks = networks;
+      if (!_.find(networks, {'Name': 'bridge'})) {
+        $scope.config.HostConfig.NetworkMode = 'nat';
+      }
+    }, function (e) {
+      Notifications.error('Failure', e, 'Unable to retrieve networks');
+    });
+
+    Container.query({}, function (d) {
+      var containers = d;
+      $scope.runningContainers = containers;
+    }, function(e) {
+      Notifications.error('Failure', e, 'Unable to retrieve running containers');
+    });
+
   }
 
   function validateForm(accessControlData, isAdmin) {
@@ -327,5 +321,4 @@ function ($q, $scope, $state, $stateParams, $filter, Config, Info, Container, Co
   }
 
   initView();
-
 }]);
diff --git a/app/components/dashboard/dashboardController.js b/app/components/dashboard/dashboardController.js
index 89f38ce00..9b01ceb56 100644
--- a/app/components/dashboard/dashboardController.js
+++ b/app/components/dashboard/dashboardController.js
@@ -1,6 +1,6 @@
 angular.module('dashboard', [])
-.controller('DashboardController', ['$scope', '$q', 'Config', 'Container', 'ContainerHelper', 'Image', 'Network', 'Volume', 'Info', 'Notifications',
-function ($scope, $q, Config, Container, ContainerHelper, Image, Network, Volume, Info, Notifications) {
+.controller('DashboardController', ['$scope', '$q', 'Container', 'ContainerHelper', 'Image', 'Network', 'Volume', 'Info', 'Notifications',
+function ($scope, $q, Container, ContainerHelper, Image, Network, Volume, Info, Notifications) {
 
   $scope.containerData = {
     total: 0
@@ -15,14 +15,10 @@ function ($scope, $q, Config, Container, ContainerHelper, Image, Network, Volume
     total: 0
   };
 
-  function prepareContainerData(d, containersToHideLabels) {
+  function prepareContainerData(d) {
     var running = 0;
     var stopped = 0;
-
     var containers = d;
-    if (containersToHideLabels) {
-      containers = ContainerHelper.hideContainers(d, containersToHideLabels);
-    }
 
     for (var i = 0; i < containers.length; i++) {
       var item = containers[i];
@@ -65,7 +61,7 @@ function ($scope, $q, Config, Container, ContainerHelper, Image, Network, Volume
     $scope.infoData = info;
   }
 
-  function fetchDashboardData(containersToHideLabels) {
+  function initView() {
     $('#loadingViewSpinner').show();
     $q.all([
       Container.query({all: 1}).$promise,
@@ -74,7 +70,7 @@ function ($scope, $q, Config, Container, ContainerHelper, Image, Network, Volume
       Network.query({}).$promise,
       Info.get({}).$promise
     ]).then(function (d) {
-      prepareContainerData(d[0], containersToHideLabels);
+      prepareContainerData(d[0]);
       prepareImageData(d[1]);
       prepareVolumeData(d[2]);
       prepareNetworkData(d[3]);
@@ -86,7 +82,5 @@ function ($scope, $q, Config, Container, ContainerHelper, Image, Network, Volume
     });
   }
 
-  Config.$promise.then(function (c) {
-    fetchDashboardData(c.hiddenLabels);
-  });
+  initView();
 }]);
diff --git a/app/components/images/imagesController.js b/app/components/images/imagesController.js
index 70918b82d..f5ecbc618 100644
--- a/app/components/images/imagesController.js
+++ b/app/components/images/imagesController.js
@@ -1,6 +1,6 @@
 angular.module('images', [])
-.controller('ImagesController', ['$scope', '$state', 'Config', 'ImageService', 'Notifications', 'Pagination', 'ModalService',
-function ($scope, $state, Config, ImageService, Notifications, Pagination, ModalService) {
+.controller('ImagesController', ['$scope', '$state', 'ImageService', 'Notifications', 'Pagination', 'ModalService',
+function ($scope, $state, ImageService, Notifications, Pagination, ModalService) {
   $scope.state = {};
   $scope.state.pagination_count = Pagination.getPaginationCount('images');
   $scope.sortType = 'RepoTags';
diff --git a/app/components/network/networkController.js b/app/components/network/networkController.js
index f6b44df84..291b6ca9e 100644
--- a/app/components/network/networkController.js
+++ b/app/components/network/networkController.js
@@ -1,6 +1,6 @@
 angular.module('network', [])
-.controller('NetworkController', ['$scope', '$state', '$stateParams', '$filter', 'Config', 'Network', 'Container', 'ContainerHelper', 'Notifications',
-function ($scope, $state, $stateParams, $filter, Config, Network, Container, ContainerHelper, Notifications) {
+.controller('NetworkController', ['$scope', '$state', '$stateParams', '$filter', 'Network', 'Container', 'ContainerHelper', 'Notifications',
+function ($scope, $state, $stateParams, $filter, Network, Container, ContainerHelper, Notifications) {
 
   $scope.removeNetwork = function removeNetwork(networkId) {
     $('#loadingViewSpinner').show();
@@ -36,21 +36,7 @@ function ($scope, $state, $stateParams, $filter, Config, Network, Container, Con
     });
   };
 
-  function getNetwork() {
-    $('#loadingViewSpinner').show();
-    Network.get({id: $stateParams.id}, function success(data) {
-      $scope.network = data;
-      getContainersInNetwork(data);
-    }, function error(err) {
-      $('#loadingViewSpinner').hide();
-      Notifications.error('Failure', err, 'Unable to retrieve network info');
-    });
-  }
-
   function filterContainersInNetwork(network, containers) {
-    if ($scope.containersToHideLabels) {
-      containers = ContainerHelper.hideContainers(containers, $scope.containersToHideLabels);
-    }
     var containersInNetwork = [];
     containers.forEach(function(container) {
       var containerInNetwork = network.Containers[container.Id];
@@ -93,8 +79,16 @@ function ($scope, $state, $stateParams, $filter, Config, Network, Container, Con
     }
   }
 
-  Config.$promise.then(function (c) {
-    $scope.containersToHideLabels = c.hiddenLabels;
-    getNetwork();
-  });
+  function initView() {
+    $('#loadingViewSpinner').show();
+    Network.get({id: $stateParams.id}, function success(data) {
+      $scope.network = data;
+      getContainersInNetwork(data);
+    }, function error(err) {
+      $('#loadingViewSpinner').hide();
+      Notifications.error('Failure', err, 'Unable to retrieve network info');
+    });
+  }
+
+  initView();
 }]);
diff --git a/app/components/networks/networksController.js b/app/components/networks/networksController.js
index 2e8e6e9ed..8468a1283 100644
--- a/app/components/networks/networksController.js
+++ b/app/components/networks/networksController.js
@@ -1,6 +1,6 @@
 angular.module('networks', [])
-.controller('NetworksController', ['$scope', '$state', 'Network', 'Config', 'Notifications', 'Pagination',
-function ($scope, $state, Network, Config, Notifications, Pagination) {
+.controller('NetworksController', ['$scope', '$state', 'Network', 'Notifications', 'Pagination',
+function ($scope, $state, Network, Notifications, Pagination) {
   $scope.state = {};
   $scope.state.pagination_count = Pagination.getPaginationCount('networks');
   $scope.state.selectedItemCount = 0;
@@ -97,7 +97,7 @@ function ($scope, $state, Network, Config, Notifications, Pagination) {
     });
   };
 
-  function fetchNetworks() {
+  function initView() {
     $('#loadNetworksSpinner').show();
     Network.query({}, function (d) {
       $scope.networks = d;
@@ -109,7 +109,5 @@ function ($scope, $state, Network, Config, Notifications, Pagination) {
     });
   }
 
-  Config.$promise.then(function (c) {
-    fetchNetworks();
-  });
+  initView();
 }]);
diff --git a/app/components/settings/settings.html b/app/components/settings/settings.html
index f0b235b46..d3e9dcede 100644
--- a/app/components/settings/settings.html
+++ b/app/components/settings/settings.html
@@ -1,66 +1,153 @@
 <rd-header>
   <rd-header-title title="Settings">
+    <i id="loadingViewSpinner" class="fa fa-cog fa-spin" style="margin-left: 5px;"></i>
   </rd-header-title>
   <rd-header-content>Settings</rd-header-content>
 </rd-header>
 
 <div class="row">
-  <div class="col-lg-12 col-md-12 col-xs-12">
+  <div class="col-sm-12">
     <rd-widget>
-      <rd-widget-header icon="fa-lock" title="Change user password"></rd-widget-header>
+      <rd-widget-header icon="fa-cogs" title="Application settings"></rd-widget-header>
       <rd-widget-body>
-        <form class="form-horizontal" style="margin-top: 15px;">
-          <!-- current-password-input -->
+        <form class="form-horizontal">
+          <!-- logo -->
+          <div class="col-sm-12 form-section-title">
+            Logo
+          </div>
           <div class="form-group">
-            <label for="current_password" class="col-sm-2 control-label text-left">Current password</label>
-            <div class="col-sm-8">
-              <div class="input-group">
-                <span class="input-group-addon"><i class="fa fa-lock" aria-hidden="true"></i></span>
-                <input type="password" class="form-control" ng-model="formValues.currentPassword" id="current_password">
+            <div class="col-sm-12">
+              <label for="toggle_logo" class="control-label text-left">
+                Use custom logo
+              </label>
+              <label class="switch" style="margin-left: 20px;">
+                <input type="checkbox" name="toggle_logo" ng-model="formValues.customLogo"><i></i>
+              </label>
+            </div>
+          </div>
+          <div ng-if="formValues.customLogo">
+            <div class="form-group">
+              <span class="col-sm-12 text-muted small">
+                You can specify the URL to your logo here. For an optimal display, logo dimensions should be 155px by 55px.
+              </span>
+            </div>
+            <div class="form-group">
+              <label for="logo_url" class="col-sm-1 control-label text-left">
+                URL
+              </label>
+              <div class="col-sm-11">
+                <input type="text" class="form-control" ng-model="settings.LogoURL" id="logo_url" placeholder="https://mycompany.com/logo.png">
               </div>
             </div>
           </div>
-          <!-- !current-password-input -->
-          <div class="form-group" ng-if="invalidPassword">
+          <!-- !logo -->
+          <!-- app-templates -->
+          <div class="col-sm-12 form-section-title">
+            App Templates
+          </div>
+          <div class="form-group">
             <div class="col-sm-12">
-              <i class="fa fa-times red-icon" aria-hidden="true"></i>
-              <span class="small text-muted">Current password is not valid</span>
+              <label for="toggle_templates" class="control-label text-left">
+                Use custom templates
+              </label>
+              <label class="switch" style="margin-left: 20px;">
+                <input type="checkbox" name="toggle_templates" ng-model="formValues.customTemplates"><i></i>
+              </label>
             </div>
           </div>
-          <!-- new-password-input -->
-          <div class="form-group">
-            <label for="new_password" class="col-sm-2 control-label text-left">New password</label>
-            <div class="col-sm-8">
-              <div class="input-group">
-                <span class="input-group-addon"><i class="fa fa-lock" aria-hidden="true"></i></span>
-                <input type="password" class="form-control" ng-model="formValues.newPassword" id="new_password">
+          <div ng-if="formValues.customTemplates">
+            <div class="form-group">
+              <span class="col-sm-12 text-muted small">
+                You can specify the URL to your own template definitions file here. See <a href="https://portainer.readthedocs.io/en/stable/templates.html" target="_blank">Portainer documentation</a> for more details.
+              </span>
+            </div>
+            <div class="form-group" >
+              <label for="templates_url" class="col-sm-1 control-label text-left">
+                URL
+              </label>
+              <div class="col-sm-11">
+                <input type="text" class="form-control" ng-model="settings.TemplatesURL" id="templates_url" placeholder="https://myserver.mydomain/templates.json">
               </div>
             </div>
           </div>
-          <!-- !new-password-input -->
           <div class="form-group">
             <div class="col-sm-12">
-              <i ng-class="{true: 'fa fa-check green-icon', false: 'fa fa-times red-icon'}[formValues.newPassword.length >= 8]" aria-hidden="true"></i>
-              <span class="small text-muted">Your new password must be at least 8 characters long</span>
+              <label for="toggle_external_contrib" class="control-label text-left">
+                Hide external contributions
+                <portainer-tooltip position="bottom" message="When enabled, external contributions such as LinuxServer.io will not be displayed in the sidebar."></portainer-tooltip>
+              </label>
+              <label class="switch" style="margin-left: 20px;">
+                <input type="checkbox" name="toggle_external_contrib" ng-model="formValues.externalContributions"><i></i>
+              </label>
             </div>
           </div>
-          <!-- confirm-password-input -->
-          <div class="form-group">
-            <label for="confirm_password" class="col-sm-2 control-label text-left">Confirm password</label>
-            <div class="col-sm-8">
-              <div class="input-group">
-                <span class="input-group-addon"><i class="fa fa-lock" aria-hidden="true"></i></span>
-                <input type="password" class="form-control" ng-model="formValues.confirmPassword" id="confirm_password">
-                <span class="input-group-addon"><i ng-class="{true: 'fa fa-check green-icon', false: 'fa fa-times red-icon'}[formValues.newPassword !== '' && formValues.newPassword === formValues.confirmPassword]" aria-hidden="true"></i></span>
-              </div>
-            </div>
-          </div>
-          <!-- !confirm-password-input -->
+          <!-- !app-templates -->
+          <!-- actions -->
           <div class="form-group">
             <div class="col-sm-12">
-              <button type="submit" class="btn btn-primary btn-sm" ng-disabled="!formValues.currentPassword || formValues.newPassword.length < 8 || formValues.newPassword !== formValues.confirmPassword" ng-click="updatePassword()">Update password</button>
+              <button type="button" class="btn btn-primary btn-sm" ng-click="saveApplicationSettings()">Save</button>
+              <i id="updateSettingsSpinner" class="fa fa-cog fa-spin" style="margin-left: 5px; display: none;"></i>
+              <!-- <span class="text-danger" ng-if="state.formValidationError" style="margin-left: 5px;">{{ state.formValidationError }}</span> -->
             </div>
           </div>
+          <!-- !actions -->
+        </form>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-sm-12">
+    <rd-widget>
+      <rd-widget-header icon="fa-tags" title="Filtered containers"></rd-widget-header>
+      <rd-widget-body>
+        <form class="form-horizontal">
+          <div class="form-group">
+            <span class="col-sm-12 text-muted small">
+              You can hide containers with specific labels from Portainer UI. You need to specify the label name and value.
+            </span>
+          </div>
+          <div class="form-group">
+            <label for="header_name" class="col-sm-1 control-label text-left">Name</label>
+            <div class="col-sm-11 col-md-4">
+              <input type="text" class="form-control" id="header_name" ng-model="formValues.labelName" placeholder="e.g. com.example.foo">
+            </div>
+            <label for="header_value" class="col-sm-1 margin-sm-top control-label text-left">Value</label>
+            <div class="col-sm-11 col-md-4 margin-sm-top">
+              <input type="text" class="form-control" id="header_value" ng-model="formValues.labelValue" placeholder="e.g. bar">
+            </div>
+            <div class="col-sm-12 col-md-2 margin-sm-top">
+              <button type="button" class="btn btn-primary btn-sm" ng-click="addFilteredContainerLabel()"><i class="fa fa-plus space-right" aria-hidden="true"></i>Add label</button>
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="col-sm-12 table-responsive">
+              <table class="table table-hover">
+                <thead>
+                  <tr>
+                    <th>Name</th>
+                    <th>Value</th>
+                    <th></th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr ng-repeat="label in settings.BlackListedLabels">
+                    <td>{{ label.name }}</td>
+                    <td>{{ label.value }}</td>
+                    <td><button type="button" class="btn btn-danger btn-xs" ng-click="removeFilteredContainerLabel($index)"><i class="fa fa-trash space-right" aria-hidden="true"></i>Remove</button></td>
+                  </tr>
+                  <tr ng-if="settings.BlackListedLabels.length === 0">
+                    <td colspan="2" class="text-center text-muted">No filtered containers labels.</td>
+                  </tr>
+                  <tr ng-if="!settings.BlackListedLabels">
+                    <td colspan="2" class="text-center text-muted">Loading...</td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+          <!-- !filtered-labels -->
         </form>
       </rd-widget-body>
     </rd-widget>
diff --git a/app/components/settings/settingsController.js b/app/components/settings/settingsController.js
index 602a5612f..f74f7def7 100644
--- a/app/components/settings/settingsController.js
+++ b/app/components/settings/settingsController.js
@@ -1,29 +1,94 @@
 angular.module('settings', [])
-.controller('SettingsController', ['$scope', '$state', '$sanitize', 'Authentication', 'UserService', 'Notifications',
-function ($scope, $state, $sanitize, Authentication, UserService, Notifications) {
+.controller('SettingsController', ['$scope', '$state', 'Notifications', 'SettingsService', 'StateManager', 'DEFAULT_TEMPLATES_URL',
+function ($scope, $state, Notifications, SettingsService, StateManager, DEFAULT_TEMPLATES_URL) {
+
   $scope.formValues = {
-    currentPassword: '',
-    newPassword: '',
-    confirmPassword: ''
+    customLogo: false,
+    customTemplates: false,
+    externalContributions: false,
+    labelName: '',
+    labelValue: ''
   };
 
-  $scope.updatePassword = function() {
-    $scope.invalidPassword = false;
-    var userID = Authentication.getUserDetails().ID;
-    var currentPassword = $sanitize($scope.formValues.currentPassword);
-    var newPassword = $sanitize($scope.formValues.newPassword);
+  $scope.removeFilteredContainerLabel = function(index) {
+    var settings = $scope.settings;
+    settings.BlackListedLabels.splice(index, 1);
 
-    UserService.updateUserPassword(userID, currentPassword, newPassword)
-    .then(function success() {
-      Notifications.success('Success', 'Password successfully updated');
-      $state.reload();
+    updateSettings(settings, false);
+  };
+
+  $scope.addFilteredContainerLabel = function() {
+    var settings = $scope.settings;
+    var label = {
+      name: $scope.formValues.labelName,
+      value: $scope.formValues.labelValue
+    };
+    settings.BlackListedLabels.push(label);
+
+    updateSettings(settings, true);
+  };
+
+  $scope.saveApplicationSettings = function() {
+    var settings = $scope.settings;
+
+    if (!$scope.formValues.customLogo) {
+      settings.LogoURL = '';
+    }
+
+    if (!$scope.formValues.customTemplates) {
+      settings.TemplatesURL = DEFAULT_TEMPLATES_URL;
+    }
+    settings.DisplayExternalContributors = !$scope.formValues.externalContributions;
+
+    updateSettings(settings, false);
+  };
+
+  function resetFormValues() {
+    $scope.formValues.labelName = '';
+    $scope.formValues.labelValue = '';
+  }
+
+  function updateSettings(settings, resetForm) {
+    $('#loadingViewSpinner').show();
+
+    SettingsService.update(settings)
+    .then(function success(data) {
+      Notifications.success('Settings updated');
+      StateManager.updateLogo(settings.LogoURL);
+      StateManager.updateExternalContributions(settings.DisplayExternalContributors);
+      if (resetForm) {
+        resetFormValues();
+      }
     })
     .catch(function error(err) {
-      if (err.invalidPassword) {
-        $scope.invalidPassword = true;
-      } else {
-        Notifications.error('Failure', err, err.msg);
-      }
+      Notifications.error('Failure', err, 'Unable to update settings');
+    })
+    .finally(function final() {
+      $('#loadingViewSpinner').hide();
     });
-  };
+  }
+
+  function initView() {
+    $('#loadingViewSpinner').show();
+    SettingsService.settings()
+    .then(function success(data) {
+      var settings = data;
+      $scope.settings = settings;
+      if (settings.LogoURL !== '') {
+        $scope.formValues.customLogo = true;
+      }
+      if (settings.TemplatesURL !== DEFAULT_TEMPLATES_URL) {
+        $scope.formValues.customTemplates = true;
+      }
+      $scope.formValues.externalContributions = !settings.DisplayExternalContributors;
+    })
+    .catch(function error(err) {
+      Notifications.error('Failure', err, 'Unable to retrieve application settings');
+    })
+    .finally(function final() {
+      $('#loadingViewSpinner').hide();
+    });
+  }
+
+  initView();
 }]);
diff --git a/app/components/sidebar/sidebar.html b/app/components/sidebar/sidebar.html
index fdad3cc53..cda6504a9 100644
--- a/app/components/sidebar/sidebar.html
+++ b/app/components/sidebar/sidebar.html
@@ -21,7 +21,7 @@
     </li>
     <li class="sidebar-list">
       <a ui-sref="templates" ui-sref-active="active">App Templates <span class="menu-icon fa fa-rocket"></span></a>
-      <div class="sidebar-sublist" ng-if="toggle && ($state.current.name === 'templates' || $state.current.name === 'templates_linuxserver')">
+      <div class="sidebar-sublist" ng-if="toggle && displayExternalContributors && ($state.current.name === 'templates' || $state.current.name === 'templates_linuxserver')">
         <a ui-sref="templates_linuxserver" ui-sref-active="active">LinuxServer.io</a>
       </div>
     </li>
@@ -52,7 +52,7 @@
     <li class="sidebar-list" ng-if="applicationState.endpoint.mode.provider === 'DOCKER_STANDALONE'">
       <a ui-sref="docker" ui-sref-active="active">Docker <span class="menu-icon fa fa-th"></span></a>
     </li>
-    <li class="sidebar-title" ng-if="isAdmin || isTeamLeader">
+    <li class="sidebar-title" ng-if="!applicationState.application.authentication || isAdmin || isTeamLeader">
       <span>Portainer settings</span>
     </li>
     <li class="sidebar-list" ng-if="applicationState.application.authentication && (isAdmin || isTeamLeader)">
@@ -64,6 +64,9 @@
     <li class="sidebar-list" ng-if="!applicationState.application.authentication || isAdmin">
       <a ui-sref="endpoints" ui-sref-active="active">Endpoints <span class="menu-icon fa fa-plug"></span></a>
     </li>
+    <li class="sidebar-list" ng-if="!applicationState.application.authentication || isAdmin">
+      <a ui-sref="settings" ui-sref-active="active">Settings <span class="menu-icon fa fa-cogs"></span></a>
+    </li>
   </ul>
   <div class="sidebar-footer">
     <div class="col-xs-12">
diff --git a/app/components/sidebar/sidebarController.js b/app/components/sidebar/sidebarController.js
index 350d82605..8d5fa1776 100644
--- a/app/components/sidebar/sidebarController.js
+++ b/app/components/sidebar/sidebarController.js
@@ -1,12 +1,10 @@
 angular.module('sidebar', [])
-.controller('SidebarController', ['$q', '$scope', '$state', 'Settings', 'Config', 'EndpointService', 'StateManager', 'EndpointProvider', 'Notifications', 'Authentication', 'UserService',
-function ($q, $scope, $state, Settings, Config, EndpointService, StateManager, EndpointProvider, Notifications, Authentication, UserService) {
+.controller('SidebarController', ['$q', '$scope', '$state', 'Settings', 'EndpointService', 'StateManager', 'EndpointProvider', 'Notifications', 'Authentication', 'UserService',
+function ($q, $scope, $state, Settings, EndpointService, StateManager, EndpointProvider, Notifications, Authentication, UserService) {
 
-  Config.$promise.then(function (c) {
-    $scope.logo = c.logo;
-  });
-
-  $scope.uiVersion = Settings.uiVersion;
+  $scope.uiVersion = StateManager.getState().application.version;
+  $scope.displayExternalContributors = StateManager.getState().application.displayExternalContributors;
+  $scope.logo = StateManager.getState().application.logo;
   $scope.endpoints = [];
 
   $scope.switchEndpoint = function(endpoint) {
diff --git a/app/components/templates/templatesController.js b/app/components/templates/templatesController.js
index f4434058a..b64eba6a4 100644
--- a/app/components/templates/templatesController.js
+++ b/app/components/templates/templatesController.js
@@ -1,6 +1,6 @@
 angular.module('templates', [])
-.controller('TemplatesController', ['$scope', '$q', '$state', '$stateParams', '$anchorScroll', '$filter', 'Config', 'ContainerService', 'ContainerHelper', 'ImageService', 'NetworkService', 'TemplateService', 'TemplateHelper', 'VolumeService', 'Notifications', 'Pagination', 'ResourceControlService', 'Authentication', 'ControllerDataPipeline', 'FormValidator',
-function ($scope, $q, $state, $stateParams, $anchorScroll, $filter, Config, ContainerService, ContainerHelper, ImageService, NetworkService, TemplateService, TemplateHelper, VolumeService, Notifications, Pagination, ResourceControlService, Authentication, ControllerDataPipeline, FormValidator) {
+.controller('TemplatesController', ['$scope', '$q', '$state', '$stateParams', '$anchorScroll', '$filter', 'ContainerService', 'ContainerHelper', 'ImageService', 'NetworkService', 'TemplateService', 'TemplateHelper', 'VolumeService', 'Notifications', 'Pagination', 'ResourceControlService', 'Authentication', 'ControllerDataPipeline', 'FormValidator',
+function ($scope, $q, $state, $stateParams, $anchorScroll, $filter, ContainerService, ContainerHelper, ImageService, NetworkService, TemplateService, TemplateHelper, VolumeService, Notifications, Pagination, ResourceControlService, Authentication, ControllerDataPipeline, FormValidator) {
   $scope.state = {
     selectedTemplate: null,
     showAdvancedOptions: false,
@@ -159,31 +159,29 @@ function ($scope, $q, $state, $stateParams, $anchorScroll, $filter, Config, Cont
 
   function initTemplates() {
     var templatesKey = $stateParams.key;
-    Config.$promise.then(function (c) {
-      $q.all({
-        templates: TemplateService.getTemplates(templatesKey),
-        containers: ContainerService.getContainers(0, c.hiddenLabels),
-        networks: NetworkService.networks(),
-        volumes: VolumeService.getVolumes()
-      })
-      .then(function success(data) {
-        $scope.templates = data.templates;
-        var availableCategories = [];
-        angular.forEach($scope.templates, function(template) {
-          availableCategories = availableCategories.concat(template.Categories);
-        });
-        $scope.availableCategories = _.sortBy(_.uniq(availableCategories));
-        $scope.runningContainers = data.containers;
-        $scope.availableNetworks = filterNetworksBasedOnProvider(data.networks);
-        $scope.availableVolumes = data.volumes.Volumes;
-      })
-      .catch(function error(err) {
-        $scope.templates = [];
-        Notifications.error('Failure', err, 'An error occured during apps initialization.');
-      })
-      .finally(function final(){
-        $('#loadTemplatesSpinner').hide();
+    $q.all({
+      templates: TemplateService.getTemplates(templatesKey),
+      containers: ContainerService.getContainers(0),
+      networks: NetworkService.networks(),
+      volumes: VolumeService.getVolumes()
+    })
+    .then(function success(data) {
+      $scope.templates = data.templates;
+      var availableCategories = [];
+      angular.forEach($scope.templates, function(template) {
+        availableCategories = availableCategories.concat(template.Categories);
       });
+      $scope.availableCategories = _.sortBy(_.uniq(availableCategories));
+      $scope.runningContainers = data.containers;
+      $scope.availableNetworks = filterNetworksBasedOnProvider(data.networks);
+      $scope.availableVolumes = data.volumes.Volumes;
+    })
+    .catch(function error(err) {
+      $scope.templates = [];
+      Notifications.error('Failure', err, 'An error occured during apps initialization.');
+    })
+    .finally(function final(){
+      $('#loadTemplatesSpinner').hide();
     });
   }
 
diff --git a/app/components/userSettings/userSettings.html b/app/components/userSettings/userSettings.html
new file mode 100644
index 000000000..8a20d22f8
--- /dev/null
+++ b/app/components/userSettings/userSettings.html
@@ -0,0 +1,68 @@
+<rd-header>
+  <rd-header-title title="User settings">
+  </rd-header-title>
+  <rd-header-content>User settings</rd-header-content>
+</rd-header>
+
+<div class="row">
+  <div class="col-lg-12 col-md-12 col-xs-12">
+    <rd-widget>
+      <rd-widget-header icon="fa-lock" title="Change user password"></rd-widget-header>
+      <rd-widget-body>
+        <form class="form-horizontal" style="margin-top: 15px;">
+          <!-- current-password-input -->
+          <div class="form-group">
+            <label for="current_password" class="col-sm-2 control-label text-left">Current password</label>
+            <div class="col-sm-8">
+              <div class="input-group">
+                <span class="input-group-addon"><i class="fa fa-lock" aria-hidden="true"></i></span>
+                <input type="password" class="form-control" ng-model="formValues.currentPassword" id="current_password">
+              </div>
+            </div>
+          </div>
+          <!-- !current-password-input -->
+          <div class="form-group" ng-if="invalidPassword">
+            <div class="col-sm-12">
+              <i class="fa fa-times red-icon" aria-hidden="true"></i>
+              <span class="small text-muted">Current password is not valid</span>
+            </div>
+          </div>
+          <!-- new-password-input -->
+          <div class="form-group">
+            <label for="new_password" class="col-sm-2 control-label text-left">New password</label>
+            <div class="col-sm-8">
+              <div class="input-group">
+                <span class="input-group-addon"><i class="fa fa-lock" aria-hidden="true"></i></span>
+                <input type="password" class="form-control" ng-model="formValues.newPassword" id="new_password">
+              </div>
+            </div>
+          </div>
+          <!-- !new-password-input -->
+          <div class="form-group">
+            <div class="col-sm-12">
+              <i ng-class="{true: 'fa fa-check green-icon', false: 'fa fa-times red-icon'}[formValues.newPassword.length >= 8]" aria-hidden="true"></i>
+              <span class="small text-muted">Your new password must be at least 8 characters long</span>
+            </div>
+          </div>
+          <!-- confirm-password-input -->
+          <div class="form-group">
+            <label for="confirm_password" class="col-sm-2 control-label text-left">Confirm password</label>
+            <div class="col-sm-8">
+              <div class="input-group">
+                <span class="input-group-addon"><i class="fa fa-lock" aria-hidden="true"></i></span>
+                <input type="password" class="form-control" ng-model="formValues.confirmPassword" id="confirm_password">
+                <span class="input-group-addon"><i ng-class="{true: 'fa fa-check green-icon', false: 'fa fa-times red-icon'}[formValues.newPassword !== '' && formValues.newPassword === formValues.confirmPassword]" aria-hidden="true"></i></span>
+              </div>
+            </div>
+          </div>
+          <!-- !confirm-password-input -->
+          <div class="form-group">
+            <div class="col-sm-12">
+              <button type="submit" class="btn btn-primary btn-sm" ng-disabled="!formValues.currentPassword || formValues.newPassword.length < 8 || formValues.newPassword !== formValues.confirmPassword" ng-click="updatePassword()">Update password</button>
+            </div>
+          </div>
+        </form>
+      </rd-widget-body>
+    </rd-widget>
+  </div>
+</div>
diff --git a/app/components/userSettings/userSettingsController.js b/app/components/userSettings/userSettingsController.js
new file mode 100644
index 000000000..d8e8f4d43
--- /dev/null
+++ b/app/components/userSettings/userSettingsController.js
@@ -0,0 +1,29 @@
+angular.module('userSettings', [])
+.controller('UserSettingsController', ['$scope', '$state', '$sanitize', 'Authentication', 'UserService', 'Notifications',
+function ($scope, $state, $sanitize, Authentication, UserService, Notifications) {
+  $scope.formValues = {
+    currentPassword: '',
+    newPassword: '',
+    confirmPassword: ''
+  };
+
+  $scope.updatePassword = function() {
+    $scope.invalidPassword = false;
+    var userID = Authentication.getUserDetails().ID;
+    var currentPassword = $sanitize($scope.formValues.currentPassword);
+    var newPassword = $sanitize($scope.formValues.newPassword);
+
+    UserService.updateUserPassword(userID, currentPassword, newPassword)
+    .then(function success() {
+      Notifications.success('Success', 'Password successfully updated');
+      $state.reload();
+    })
+    .catch(function error(err) {
+      if (err.invalidPassword) {
+        $scope.invalidPassword = true;
+      } else {
+        Notifications.error('Failure', err, err.msg);
+      }
+    });
+  };
+}]);
diff --git a/app/directives/header-content.js b/app/directives/header-content.js
index 8636c8ebe..ecb52136d 100644
--- a/app/directives/header-content.js
+++ b/app/directives/header-content.js
@@ -7,7 +7,7 @@ angular
     link: function (scope, iElement, iAttrs) {
       scope.username = Authentication.getUserDetails().username;
     },
-    template: '<div class="breadcrumb-links"><div class="pull-left" ng-transclude></div><div class="pull-right" ng-if="username"><a ui-sref="settings" style="margin-right: 5px;"><u><i class="fa fa-wrench" aria-hidden="true"></i> my account </u></a><a ui-sref="auth({logout: true})" class="text-danger" style="margin-right: 25px;"><u><i class="fa fa-sign-out" aria-hidden="true"></i> log out</u></a></div></div>',
+    template: '<div class="breadcrumb-links"><div class="pull-left" ng-transclude></div><div class="pull-right" ng-if="username"><a ui-sref="userSettings" style="margin-right: 5px;"><u><i class="fa fa-wrench" aria-hidden="true"></i> my account </u></a><a ui-sref="auth({logout: true})" class="text-danger" style="margin-right: 25px;"><u><i class="fa fa-sign-out" aria-hidden="true"></i> log out</u></a></div></div>',
     restrict: 'E'
   };
   return directive;
diff --git a/app/helpers/containerHelper.js b/app/helpers/containerHelper.js
index 3e806e24c..6f74332c7 100644
--- a/app/helpers/containerHelper.js
+++ b/app/helpers/containerHelper.js
@@ -7,20 +7,5 @@ angular.module('portainer.helpers')
     return splitargs(command);
   };
 
-  helper.hideContainers = function(containers, containersToHideLabels) {
-    return containers.filter(function (container) {
-      var filterContainer = false;
-      containersToHideLabels.forEach(function(label, index) {
-        if (_.has(container.Labels, label.name) &&
-        container.Labels[label.name] === label.value) {
-          filterContainer = true;
-        }
-      });
-      if (!filterContainer) {
-        return container;
-      }
-    });
-  };
-
   return helper;
 }]);
diff --git a/app/models/api/settings.js b/app/models/api/settings.js
new file mode 100644
index 000000000..889d18ad1
--- /dev/null
+++ b/app/models/api/settings.js
@@ -0,0 +1,6 @@
+function SettingsViewModel(data) {
+  this.TemplatesURL = data.TemplatesURL;
+  this.LogoURL = data.LogoURL;
+  this.BlackListedLabels = data.BlackListedLabels;
+  this.DisplayExternalContributors = data.DisplayExternalContributors;
+}
diff --git a/app/models/api/status.js b/app/models/api/status.js
new file mode 100644
index 000000000..292971f26
--- /dev/null
+++ b/app/models/api/status.js
@@ -0,0 +1,6 @@
+function StatusViewModel(data) {
+  this.Authentication = data.Authentication;
+  this.EndpointManagement = data.EndpointManagement;
+  this.Analytics = data.Analytics;
+  this.Version = data.Version;
+}
diff --git a/app/rest/auth.js b/app/rest/api/auth.js
similarity index 100%
rename from app/rest/auth.js
rename to app/rest/api/auth.js
diff --git a/app/rest/endpoint.js b/app/rest/api/endpoint.js
similarity index 100%
rename from app/rest/endpoint.js
rename to app/rest/api/endpoint.js
diff --git a/app/rest/resourceControl.js b/app/rest/api/resourceControl.js
similarity index 100%
rename from app/rest/resourceControl.js
rename to app/rest/api/resourceControl.js
diff --git a/app/rest/api/settings.js b/app/rest/api/settings.js
new file mode 100644
index 000000000..5e7471ad9
--- /dev/null
+++ b/app/rest/api/settings.js
@@ -0,0 +1,8 @@
+angular.module('portainer.rest')
+.factory('Settings', ['$resource', 'SETTINGS_ENDPOINT', function SettingsFactory($resource, SETTINGS_ENDPOINT) {
+  'use strict';
+  return $resource(SETTINGS_ENDPOINT, {}, {
+    get: { method: 'GET' },
+    update: { method: 'PUT' }
+  });
+}]);
diff --git a/app/rest/api/status.js b/app/rest/api/status.js
new file mode 100644
index 000000000..b636ed283
--- /dev/null
+++ b/app/rest/api/status.js
@@ -0,0 +1,7 @@
+angular.module('portainer.rest')
+.factory('Status', ['$resource', 'STATUS_ENDPOINT', function StatusFactory($resource, STATUS_ENDPOINT) {
+  'use strict';
+  return $resource(STATUS_ENDPOINT, {}, {
+    get: { method: 'GET' }
+  });
+}]);
diff --git a/app/rest/team.js b/app/rest/api/team.js
similarity index 100%
rename from app/rest/team.js
rename to app/rest/api/team.js
diff --git a/app/rest/teamMembership.js b/app/rest/api/teamMembership.js
similarity index 100%
rename from app/rest/teamMembership.js
rename to app/rest/api/teamMembership.js
diff --git a/app/rest/template.js b/app/rest/api/template.js
similarity index 100%
rename from app/rest/template.js
rename to app/rest/api/template.js
diff --git a/app/rest/user.js b/app/rest/api/user.js
similarity index 100%
rename from app/rest/user.js
rename to app/rest/api/user.js
diff --git a/app/rest/config.js b/app/rest/config.js
deleted file mode 100644
index 2e8f14f9f..000000000
--- a/app/rest/config.js
+++ /dev/null
@@ -1,4 +0,0 @@
-angular.module('portainer.rest')
-.factory('Config', ['$resource', 'CONFIG_ENDPOINT', function ConfigFactory($resource, CONFIG_ENDPOINT) {
-  return $resource(CONFIG_ENDPOINT).get();
-}]);
diff --git a/app/rest/containerCommit.js b/app/rest/containerCommit.js
deleted file mode 100644
index a3e13331a..000000000
--- a/app/rest/containerCommit.js
+++ /dev/null
@@ -1,10 +0,0 @@
-angular.module('portainer.rest')
-.factory('ContainerCommit', ['$resource', 'Settings', 'EndpointProvider', function ContainerCommitFactory($resource, Settings, EndpointProvider) {
-  'use strict';
-  return $resource(Settings.url + '/:endpointId/commit', {
-    endpointId: EndpointProvider.endpointID
-  },
-  {
-    commit: {method: 'POST', params: {container: '@id', repo: '@repo', tag: '@tag'}}
-  });
-}]);
diff --git a/app/rest/container.js b/app/rest/docker/container.js
similarity index 85%
rename from app/rest/container.js
rename to app/rest/docker/container.js
index b53b49264..511e61d5f 100644
--- a/app/rest/container.js
+++ b/app/rest/docker/container.js
@@ -1,7 +1,7 @@
 angular.module('portainer.rest')
-.factory('Container', ['$resource', 'Settings', 'EndpointProvider', function ContainerFactory($resource, Settings, EndpointProvider) {
+.factory('Container', ['$resource', 'DOCKER_ENDPOINT', 'EndpointProvider', function ContainerFactory($resource, DOCKER_ENDPOINT, EndpointProvider) {
   'use strict';
-  return $resource(Settings.url + '/:endpointId/containers/:id/:action', {
+  return $resource(DOCKER_ENDPOINT + '/:endpointId/containers/:id/:action', {
     name: '@name',
     endpointId: EndpointProvider.endpointID
   },
diff --git a/app/rest/docker/containerCommit.js b/app/rest/docker/containerCommit.js
new file mode 100644
index 000000000..5fff5912b
--- /dev/null
+++ b/app/rest/docker/containerCommit.js
@@ -0,0 +1,10 @@
+angular.module('portainer.rest')
+.factory('ContainerCommit', ['$resource', 'DOCKER_ENDPOINT', 'EndpointProvider', function ContainerCommitFactory($resource, DOCKER_ENDPOINT, EndpointProvider) {
+  'use strict';
+  return $resource(DOCKER_ENDPOINT + '/:endpointId/commit', {
+    endpointId: EndpointProvider.endpointID
+  },
+  {
+    commit: {method: 'POST', params: {container: '@id', repo: '@repo', tag: '@tag'}}
+  });
+}]);
diff --git a/app/rest/containerLogs.js b/app/rest/docker/containerLogs.js
similarity index 65%
rename from app/rest/containerLogs.js
rename to app/rest/docker/containerLogs.js
index cc4f8408e..a7dbf85b8 100644
--- a/app/rest/containerLogs.js
+++ b/app/rest/docker/containerLogs.js
@@ -1,11 +1,11 @@
 angular.module('portainer.rest')
-.factory('ContainerLogs', ['$http', 'Settings', 'EndpointProvider', function ContainerLogsFactory($http, Settings, EndpointProvider) {
+.factory('ContainerLogs', ['$http', 'DOCKER_ENDPOINT', 'EndpointProvider', function ContainerLogsFactory($http, DOCKER_ENDPOINT, EndpointProvider) {
   'use strict';
   return {
     get: function (id, params, callback) {
       $http({
         method: 'GET',
-        url: Settings.url + '/' + EndpointProvider.endpointID() + '/containers/' + id + '/logs',
+        url: DOCKER_ENDPOINT + '/' + EndpointProvider.endpointID() + '/containers/' + id + '/logs',
         params: {
           'stdout': params.stdout || 0,
           'stderr': params.stderr || 0,
diff --git a/app/rest/containerTop.js b/app/rest/docker/containerTop.js
similarity index 53%
rename from app/rest/containerTop.js
rename to app/rest/docker/containerTop.js
index 050f5653f..edefb3e1d 100644
--- a/app/rest/containerTop.js
+++ b/app/rest/docker/containerTop.js
@@ -1,11 +1,11 @@
 angular.module('portainer.rest')
-.factory('ContainerTop', ['$http', 'Settings', 'EndpointProvider', function ($http, Settings, EndpointProvider) {
+.factory('ContainerTop', ['$http', 'DOCKER_ENDPOINT', 'EndpointProvider', function ($http, DOCKER_ENDPOINT, EndpointProvider) {
   'use strict';
   return {
     get: function (id, params, callback, errorCallback) {
       $http({
         method: 'GET',
-        url: Settings.url + '/' + EndpointProvider.endpointID() + '/containers/' + id + '/top',
+        url: DOCKER_ENDPOINT + '/' + EndpointProvider.endpointID() + '/containers/' + id + '/top',
         params: {
           ps_args: params.ps_args
         }
diff --git a/app/rest/event.js b/app/rest/docker/event.js
similarity index 56%
rename from app/rest/event.js
rename to app/rest/docker/event.js
index ddc5aa436..468b8e0f4 100644
--- a/app/rest/event.js
+++ b/app/rest/docker/event.js
@@ -1,7 +1,7 @@
 angular.module('portainer.rest')
-.factory('Events', ['$resource', 'Settings', 'EndpointProvider', function EventFactory($resource, Settings, EndpointProvider) {
+.factory('Events', ['$resource', 'DOCKER_ENDPOINT', 'EndpointProvider', function EventFactory($resource, DOCKER_ENDPOINT, EndpointProvider) {
   'use strict';
-  return $resource(Settings.url + '/:endpointId/events', {
+  return $resource(DOCKER_ENDPOINT + '/:endpointId/events', {
     endpointId: EndpointProvider.endpointID
   },
   {
diff --git a/app/rest/exec.js b/app/rest/docker/exec.js
similarity index 55%
rename from app/rest/exec.js
rename to app/rest/docker/exec.js
index c354090ba..c29036197 100644
--- a/app/rest/exec.js
+++ b/app/rest/docker/exec.js
@@ -1,7 +1,7 @@
 angular.module('portainer.rest')
-.factory('Exec', ['$resource', 'Settings', 'EndpointProvider', function ExecFactory($resource, Settings, EndpointProvider) {
+.factory('Exec', ['$resource', 'DOCKER_ENDPOINT', 'EndpointProvider', function ExecFactory($resource, DOCKER_ENDPOINT, EndpointProvider) {
   'use strict';
-  return $resource(Settings.url + '/:endpointId/exec/:id/:action', {
+  return $resource(DOCKER_ENDPOINT + '/:endpointId/exec/:id/:action', {
     endpointId: EndpointProvider.endpointID
   },
   {
diff --git a/app/rest/image.js b/app/rest/docker/image.js
similarity index 83%
rename from app/rest/image.js
rename to app/rest/docker/image.js
index 41a76c803..e9f58d190 100644
--- a/app/rest/image.js
+++ b/app/rest/docker/image.js
@@ -1,7 +1,7 @@
 angular.module('portainer.rest')
-.factory('Image', ['$resource', 'Settings', 'EndpointProvider', function ImageFactory($resource, Settings, EndpointProvider) {
+.factory('Image', ['$resource', 'DOCKER_ENDPOINT', 'EndpointProvider', function ImageFactory($resource, DOCKER_ENDPOINT, EndpointProvider) {
   'use strict';
-  return $resource(Settings.url + '/:endpointId/images/:id/:action', {
+  return $resource(DOCKER_ENDPOINT + '/:endpointId/images/:id/:action', {
     endpointId: EndpointProvider.endpointID
   },
   {
diff --git a/app/rest/docker/info.js b/app/rest/docker/info.js
new file mode 100644
index 000000000..9f9b0d2f2
--- /dev/null
+++ b/app/rest/docker/info.js
@@ -0,0 +1,7 @@
+angular.module('portainer.rest')
+.factory('Info', ['$resource', 'DOCKER_ENDPOINT', 'EndpointProvider', function InfoFactory($resource, DOCKER_ENDPOINT, EndpointProvider) {
+  'use strict';
+  return $resource(DOCKER_ENDPOINT + '/:endpointId/info', {
+    endpointId: EndpointProvider.endpointID
+  });
+}]);
diff --git a/app/rest/network.js b/app/rest/docker/network.js
similarity index 68%
rename from app/rest/network.js
rename to app/rest/docker/network.js
index 030c23753..39e10b4b2 100644
--- a/app/rest/network.js
+++ b/app/rest/docker/network.js
@@ -1,7 +1,7 @@
 angular.module('portainer.rest')
-.factory('Network', ['$resource', 'Settings', 'EndpointProvider', function NetworkFactory($resource, Settings, EndpointProvider) {
+.factory('Network', ['$resource', 'DOCKER_ENDPOINT', 'EndpointProvider', function NetworkFactory($resource, DOCKER_ENDPOINT, EndpointProvider) {
   'use strict';
-  return $resource(Settings.url + '/:endpointId/networks/:id/:action', {
+  return $resource(DOCKER_ENDPOINT + '/:endpointId/networks/:id/:action', {
     id: '@id',
     endpointId: EndpointProvider.endpointID
   },
diff --git a/app/rest/node.js b/app/rest/docker/node.js
similarity index 62%
rename from app/rest/node.js
rename to app/rest/docker/node.js
index 6d300f3fe..1dc13f588 100644
--- a/app/rest/node.js
+++ b/app/rest/docker/node.js
@@ -1,7 +1,7 @@
 angular.module('portainer.rest')
-.factory('Node', ['$resource', 'Settings', 'EndpointProvider', function NodeFactory($resource, Settings, EndpointProvider) {
+.factory('Node', ['$resource', 'DOCKER_ENDPOINT', 'EndpointProvider', function NodeFactory($resource, DOCKER_ENDPOINT, EndpointProvider) {
   'use strict';
-  return $resource(Settings.url + '/:endpointId/nodes/:id/:action', {
+  return $resource(DOCKER_ENDPOINT + '/:endpointId/nodes/:id/:action', {
     endpointId: EndpointProvider.endpointID
   },
   {
diff --git a/app/rest/response/handlers.js b/app/rest/docker/response/handlers.js
similarity index 100%
rename from app/rest/response/handlers.js
rename to app/rest/docker/response/handlers.js
diff --git a/app/rest/secret.js b/app/rest/docker/secret.js
similarity index 59%
rename from app/rest/secret.js
rename to app/rest/docker/secret.js
index 2cd06a759..976b8053d 100644
--- a/app/rest/secret.js
+++ b/app/rest/docker/secret.js
@@ -1,7 +1,7 @@
 angular.module('portainer.rest')
-.factory('Secret', ['$resource', 'Settings', 'EndpointProvider', function SecretFactory($resource, Settings, EndpointProvider) {
+.factory('Secret', ['$resource', 'DOCKER_ENDPOINT', 'EndpointProvider', function SecretFactory($resource, DOCKER_ENDPOINT, EndpointProvider) {
   'use strict';
-  return $resource(Settings.url + '/:endpointId/secrets/:id/:action', {
+  return $resource(DOCKER_ENDPOINT + '/:endpointId/secrets/:id/:action', {
     endpointId: EndpointProvider.endpointID
   }, {
     get: { method: 'GET', params: {id: '@id'} },
diff --git a/app/rest/service.js b/app/rest/docker/service.js
similarity index 65%
rename from app/rest/service.js
rename to app/rest/docker/service.js
index 2a5ca1f30..cd0e377b4 100644
--- a/app/rest/service.js
+++ b/app/rest/docker/service.js
@@ -1,7 +1,7 @@
 angular.module('portainer.rest')
-.factory('Service', ['$resource', 'Settings', 'EndpointProvider', function ServiceFactory($resource, Settings, EndpointProvider) {
+.factory('Service', ['$resource', 'DOCKER_ENDPOINT', 'EndpointProvider', function ServiceFactory($resource, DOCKER_ENDPOINT, EndpointProvider) {
   'use strict';
-  return $resource(Settings.url + '/:endpointId/services/:id/:action', {
+  return $resource(DOCKER_ENDPOINT + '/:endpointId/services/:id/:action', {
     endpointId: EndpointProvider.endpointID
   },
   {
diff --git a/app/rest/docker/swarm.js b/app/rest/docker/swarm.js
new file mode 100644
index 000000000..cec81e85f
--- /dev/null
+++ b/app/rest/docker/swarm.js
@@ -0,0 +1,10 @@
+angular.module('portainer.rest')
+.factory('Swarm', ['$resource', 'DOCKER_ENDPOINT', 'EndpointProvider', function SwarmFactory($resource, DOCKER_ENDPOINT, EndpointProvider) {
+  'use strict';
+  return $resource(DOCKER_ENDPOINT + '/:endpointId/swarm', {
+    endpointId: EndpointProvider.endpointID
+  },
+  {
+    get: {method: 'GET'}
+  });
+}]);
diff --git a/app/rest/task.js b/app/rest/docker/task.js
similarity index 53%
rename from app/rest/task.js
rename to app/rest/docker/task.js
index 2fe03b502..2ce993cef 100644
--- a/app/rest/task.js
+++ b/app/rest/docker/task.js
@@ -1,7 +1,7 @@
 angular.module('portainer.rest')
-.factory('Task', ['$resource', 'Settings', 'EndpointProvider', function TaskFactory($resource, Settings, EndpointProvider) {
+.factory('Task', ['$resource', 'DOCKER_ENDPOINT', 'EndpointProvider', function TaskFactory($resource, DOCKER_ENDPOINT, EndpointProvider) {
   'use strict';
-  return $resource(Settings.url + '/:endpointId/tasks/:id', {
+  return $resource(DOCKER_ENDPOINT + '/:endpointId/tasks/:id', {
     endpointId: EndpointProvider.endpointID
   },
   {
diff --git a/app/rest/docker/version.js b/app/rest/docker/version.js
new file mode 100644
index 000000000..01e904ec4
--- /dev/null
+++ b/app/rest/docker/version.js
@@ -0,0 +1,7 @@
+angular.module('portainer.rest')
+.factory('Version', ['$resource', 'DOCKER_ENDPOINT', 'EndpointProvider', function VersionFactory($resource, DOCKER_ENDPOINT, EndpointProvider) {
+    'use strict';
+    return $resource(DOCKER_ENDPOINT + '/:endpointId/version', {
+      endpointId: EndpointProvider.endpointID
+    });
+}]);
diff --git a/app/rest/volume.js b/app/rest/docker/volume.js
similarity index 64%
rename from app/rest/volume.js
rename to app/rest/docker/volume.js
index e6a5aa2c4..3bb900df7 100644
--- a/app/rest/volume.js
+++ b/app/rest/docker/volume.js
@@ -1,7 +1,7 @@
 angular.module('portainer.rest')
-.factory('Volume', ['$resource', 'Settings', 'EndpointProvider', function VolumeFactory($resource, Settings, EndpointProvider) {
+.factory('Volume', ['$resource', 'DOCKER_ENDPOINT', 'EndpointProvider', function VolumeFactory($resource, DOCKER_ENDPOINT, EndpointProvider) {
   'use strict';
-  return $resource(Settings.url + '/:endpointId/volumes/:id/:action',
+  return $resource(DOCKER_ENDPOINT + '/:endpointId/volumes/:id/:action',
   {
     endpointId: EndpointProvider.endpointID
   },
diff --git a/app/rest/info.js b/app/rest/info.js
deleted file mode 100644
index 007a4444a..000000000
--- a/app/rest/info.js
+++ /dev/null
@@ -1,7 +0,0 @@
-angular.module('portainer.rest')
-.factory('Info', ['$resource', 'Settings', 'EndpointProvider', function InfoFactory($resource, Settings, EndpointProvider) {
-  'use strict';
-  return $resource(Settings.url + '/:endpointId/info', {
-    endpointId: EndpointProvider.endpointID
-  });
-}]);
diff --git a/app/rest/swarm.js b/app/rest/swarm.js
deleted file mode 100644
index 134827a0f..000000000
--- a/app/rest/swarm.js
+++ /dev/null
@@ -1,10 +0,0 @@
-angular.module('portainer.rest')
-.factory('Swarm', ['$resource', 'Settings', 'EndpointProvider', function SwarmFactory($resource, Settings, EndpointProvider) {
-  'use strict';
-  return $resource(Settings.url + '/:endpointId/swarm', {
-    endpointId: EndpointProvider.endpointID
-  },
-  {
-    get: {method: 'GET'}
-  });
-}]);
diff --git a/app/rest/version.js b/app/rest/version.js
deleted file mode 100644
index d6bd6fb37..000000000
--- a/app/rest/version.js
+++ /dev/null
@@ -1,7 +0,0 @@
-angular.module('portainer.rest')
-.factory('Version', ['$resource', 'Settings', 'EndpointProvider', function VersionFactory($resource, Settings, EndpointProvider) {
-    'use strict';
-    return $resource(Settings.url + '/:endpointId/version', {
-      endpointId: EndpointProvider.endpointID
-    });
-}]);
diff --git a/app/services/endpointService.js b/app/services/api/endpointService.js
similarity index 100%
rename from app/services/endpointService.js
rename to app/services/api/endpointService.js
diff --git a/app/services/resourceControlService.js b/app/services/api/resourceControlService.js
similarity index 100%
rename from app/services/resourceControlService.js
rename to app/services/api/resourceControlService.js
diff --git a/app/services/api/settingsService.js b/app/services/api/settingsService.js
new file mode 100644
index 000000000..6c9718ce1
--- /dev/null
+++ b/app/services/api/settingsService.js
@@ -0,0 +1,26 @@
+angular.module('portainer.services')
+.factory('SettingsService', ['$q', 'Settings', function SettingsServiceFactory($q, Settings) {
+  'use strict';
+  var service = {};
+
+  service.settings = function() {
+    var deferred = $q.defer();
+
+    Settings.get().$promise
+    .then(function success(data) {
+      var status = new SettingsViewModel(data);
+      deferred.resolve(status);
+    })
+    .catch(function error(err) {
+      deferred.reject({ msg: 'Unable to retrieve application settings', err: err });
+    });
+
+    return deferred.promise;
+  };
+
+  service.update = function(settings) {
+    return Settings.update({}, settings).$promise;
+  };
+
+  return service;
+}]);
diff --git a/app/services/api/statusService.js b/app/services/api/statusService.js
new file mode 100644
index 000000000..0989514ab
--- /dev/null
+++ b/app/services/api/statusService.js
@@ -0,0 +1,22 @@
+angular.module('portainer.services')
+.factory('StatusService', ['$q', 'Status', function StatusServiceFactory($q, Status) {
+  'use strict';
+  var service = {};
+
+  service.status = function() {
+    var deferred = $q.defer();
+
+    Status.get().$promise
+    .then(function success(data) {
+      var status = new StatusViewModel(data);
+      deferred.resolve(status);
+    })
+    .catch(function error(err) {
+      deferred.reject({ msg: 'Unable to retrieve application status', err: err });
+    });
+
+    return deferred.promise;
+  };
+
+  return service;
+}]);
diff --git a/app/services/teamMembershipService.js b/app/services/api/teamMembershipService.js
similarity index 100%
rename from app/services/teamMembershipService.js
rename to app/services/api/teamMembershipService.js
diff --git a/app/services/teamService.js b/app/services/api/teamService.js
similarity index 100%
rename from app/services/teamService.js
rename to app/services/api/teamService.js
diff --git a/app/services/userService.js b/app/services/api/userService.js
similarity index 100%
rename from app/services/userService.js
rename to app/services/api/userService.js
diff --git a/app/services/containerService.js b/app/services/docker/containerService.js
similarity index 86%
rename from app/services/containerService.js
rename to app/services/docker/containerService.js
index 8271b49b3..39d1494ed 100644
--- a/app/services/containerService.js
+++ b/app/services/docker/containerService.js
@@ -1,17 +1,14 @@
 angular.module('portainer.services')
-.factory('ContainerService', ['$q', 'Container', 'ContainerHelper', 'ResourceControlService', function ContainerServiceFactory($q, Container, ContainerHelper, ResourceControlService) {
+.factory('ContainerService', ['$q', 'Container', 'ResourceControlService', function ContainerServiceFactory($q, Container, ResourceControlService) {
   'use strict';
   var service = {};
 
-  service.getContainers = function (all, hiddenLabels) {
+  service.getContainers = function (all) {
     var deferred = $q.defer();
     Container.query({ all: all }).$promise
     .then(function success(data) {
       var containers = data;
-      if (hiddenLabels) {
-        containers = ContainerHelper.hideContainers(data, hiddenLabels);
-      }
-      deferred.resolve(data);
+      deferred.resolve(containers);
     })
     .catch(function error(err) {
       deferred.reject({ msg: 'Unable to retriever containers', err: err });
diff --git a/app/services/imageService.js b/app/services/docker/imageService.js
similarity index 100%
rename from app/services/imageService.js
rename to app/services/docker/imageService.js
diff --git a/app/services/infoService.js b/app/services/docker/infoService.js
similarity index 100%
rename from app/services/infoService.js
rename to app/services/docker/infoService.js
diff --git a/app/services/networkService.js b/app/services/docker/networkService.js
similarity index 100%
rename from app/services/networkService.js
rename to app/services/docker/networkService.js
diff --git a/app/services/nodeService.js b/app/services/docker/nodeService.js
similarity index 100%
rename from app/services/nodeService.js
rename to app/services/docker/nodeService.js
diff --git a/app/services/secretService.js b/app/services/docker/secretService.js
similarity index 100%
rename from app/services/secretService.js
rename to app/services/docker/secretService.js
diff --git a/app/services/serviceService.js b/app/services/docker/serviceService.js
similarity index 100%
rename from app/services/serviceService.js
rename to app/services/docker/serviceService.js
diff --git a/app/services/taskService.js b/app/services/docker/taskService.js
similarity index 100%
rename from app/services/taskService.js
rename to app/services/docker/taskService.js
diff --git a/app/services/volumeService.js b/app/services/docker/volumeService.js
similarity index 100%
rename from app/services/volumeService.js
rename to app/services/docker/volumeService.js
diff --git a/app/services/lineChart.js b/app/services/lineChart.js
index 1bfbc8473..de0df4baf 100644
--- a/app/services/lineChart.js
+++ b/app/services/lineChart.js
@@ -1,5 +1,5 @@
 angular.module('portainer.services')
-.factory('LineChart', ['Settings', function LineChartFactory(Settings) {
+.factory('LineChart', [function LineChartFactory() {
   'use strict';
   return {
     build: function (id, data, getkey) {
diff --git a/app/services/pagination.js b/app/services/pagination.js
index 23bfecf8c..60ba694bc 100644
--- a/app/services/pagination.js
+++ b/app/services/pagination.js
@@ -1,10 +1,10 @@
 angular.module('portainer.services')
-.factory('Pagination', ['LocalStorage', 'Settings', function PaginationFactory(LocalStorage, Settings) {
+.factory('Pagination', ['LocalStorage', 'PAGINATION_MAX_ITEMS', function PaginationFactory(LocalStorage, PAGINATION_MAX_ITEMS) {
   'use strict';
   return {
     getPaginationCount: function(key) {
       var storedCount = LocalStorage.getPaginationCount(key);
-      var paginationCount = Settings.pagination_count;
+      var paginationCount = PAGINATION_MAX_ITEMS;
       if (storedCount !== null) {
         paginationCount = storedCount;
       }
diff --git a/app/services/settings.js b/app/services/settings.js
deleted file mode 100644
index ed367f38c..000000000
--- a/app/services/settings.js
+++ /dev/null
@@ -1,17 +0,0 @@
-angular.module('portainer.services')
-.factory('Settings', ['DOCKER_ENDPOINT', 'DOCKER_PORT', 'UI_VERSION', 'PAGINATION_MAX_ITEMS', function SettingsFactory(DOCKER_ENDPOINT, DOCKER_PORT, UI_VERSION, PAGINATION_MAX_ITEMS) {
-  'use strict';
-  var url = DOCKER_ENDPOINT;
-  if (DOCKER_PORT) {
-    url = url + DOCKER_PORT + '\\' + DOCKER_PORT;
-  }
-  var firstLoad = (localStorage.getItem('firstLoad') || 'true') === 'true';
-  return {
-    displayAll: true,
-    endpoint: DOCKER_ENDPOINT,
-    uiVersion: UI_VERSION,
-    url: url,
-    firstLoad: firstLoad,
-    pagination_count: PAGINATION_MAX_ITEMS
-  };
-}]);
diff --git a/app/services/stateManager.js b/app/services/stateManager.js
index c17dae338..d18e544b6 100644
--- a/app/services/stateManager.js
+++ b/app/services/stateManager.js
@@ -1,67 +1,95 @@
 angular.module('portainer.services')
-.factory('StateManager', ['$q', 'Config', 'Info', 'InfoHelper', 'Version', 'LocalStorage', function StateManagerFactory($q, Config, Info, InfoHelper, Version, LocalStorage) {
+.factory('StateManager', ['$q', 'Info', 'InfoHelper', 'Version', 'LocalStorage', 'SettingsService', 'StatusService', function StateManagerFactory($q, Info, InfoHelper, Version, LocalStorage, SettingsService, StatusService) {
   'use strict';
 
+  var manager = {};
+
   var state = {
     loading: true,
     application: {},
-    endpoint: {}
+    endpoint: {},
+    UI: {}
   };
 
-  return {
-    initialize: function() {
-      var endpointState = LocalStorage.getEndpointState();
-      if (endpointState) {
-        state.endpoint = endpointState;
-      }
+  manager.getState = function() {
+    return state;
+  };
 
-      var deferred = $q.defer();
-      var applicationState = LocalStorage.getApplicationState();
-      if (applicationState) {
-        state.application = applicationState;
-        state.loading = false;
-        deferred.resolve(state);
-      } else {
-        Config.$promise.then(function success(data) {
-          state.application.authentication = data.authentication;
-          state.application.analytics = data.analytics;
-          state.application.endpointManagement = data.endpointManagement;
-          state.application.logo = data.logo;
-          LocalStorage.storeApplicationState(state.application);
-          state.loading = false;
-          deferred.resolve(state);
-        }, function error(err) {
-          state.loading = false;
-          deferred.reject({msg: 'Unable to retrieve server configuration', err: err});
-        });
-      }
-      return deferred.promise;
-    },
-    clean: function() {
-      state.endpoint = {};
-    },
-    updateEndpointState: function(loading) {
-      var deferred = $q.defer();
-      if (loading) {
-        state.loading = true;
-      }
-      $q.all([Info.get({}).$promise, Version.get({}).$promise])
-      .then(function success(data) {
-        var endpointMode = InfoHelper.determineEndpointMode(data[0]);
-        var endpointAPIVersion = parseFloat(data[1].ApiVersion);
-        state.endpoint.mode = endpointMode;
-        state.endpoint.apiVersion = endpointAPIVersion;
-        LocalStorage.storeEndpointState(state.endpoint);
-        state.loading = false;
-        deferred.resolve();
-      }, function error(err) {
-        state.loading = false;
-        deferred.reject({msg: 'Unable to connect to the Docker endpoint', err: err});
-      });
-      return deferred.promise;
-    },
-    getState: function() {
-      return state;
+  manager.clean = function () {
+    state.endpoint = {};
+  };
+
+  manager.updateLogo = function(logoURL) {
+    state.application.logo = logoURL;
+    LocalStorage.storeApplicationState(state.application);
+  };
+
+  manager.updateExternalContributions = function(displayExternalContributors) {
+    state.application.displayExternalContributors = displayExternalContributors;
+    LocalStorage.storeApplicationState(state.application);
+  };
+
+  manager.initialize = function () {
+    var deferred = $q.defer();
+
+    var endpointState = LocalStorage.getEndpointState();
+    if (endpointState) {
+      state.endpoint = endpointState;
     }
+
+    var applicationState = LocalStorage.getApplicationState();
+    if (applicationState) {
+      state.application = applicationState;
+      state.loading = false;
+      deferred.resolve(state);
+    } else {
+      $q.all({
+        settings: SettingsService.settings(),
+        status: StatusService.status()
+      })
+      .then(function success(data) {
+        var status = data.status;
+        var settings = data.settings;
+        state.application.authentication = status.Authentication;
+        state.application.analytics = status.Analytics;
+        state.application.endpointManagement = status.EndpointManagement;
+        state.application.version = status.Version;
+        state.application.logo = settings.LogoURL;
+        state.application.displayExternalContributors = settings.DisplayExternalContributors;
+        LocalStorage.storeApplicationState(state.application);
+        deferred.resolve(state);
+      })
+      .catch(function error(err) {
+        deferred.reject({msg: 'Unable to retrieve server settings and status', err: err});
+      })
+      .finally(function final() {
+        state.loading = false;
+      });
+    }
+
+    return deferred.promise;
   };
+
+  manager.updateEndpointState = function(loading) {
+    var deferred = $q.defer();
+    if (loading) {
+      state.loading = true;
+    }
+    $q.all([Info.get({}).$promise, Version.get({}).$promise])
+    .then(function success(data) {
+      var endpointMode = InfoHelper.determineEndpointMode(data[0]);
+      var endpointAPIVersion = parseFloat(data[1].ApiVersion);
+      state.endpoint.mode = endpointMode;
+      state.endpoint.apiVersion = endpointAPIVersion;
+      LocalStorage.storeEndpointState(state.endpoint);
+      state.loading = false;
+      deferred.resolve();
+    }, function error(err) {
+      state.loading = false;
+      deferred.reject({msg: 'Unable to connect to the Docker endpoint', err: err});
+    });
+    return deferred.promise;
+  };
+
+  return manager;
 }]);