diff --git a/cmd/web/app-links.go b/cmd/web/app-links.go
index 9884353..3f5b060 100644
--- a/cmd/web/app-links.go
+++ b/cmd/web/app-links.go
@@ -13,172 +13,297 @@ type AppLink struct {
 	Description string
 	SpecialNote string
 	LDAP bool
+	Tiers map[string]bool
 }
 
 func getAppLinks(tier, baseUri string) []AppLink {
-	var output []AppLink
+	var links []AppLink
 
-	//Get Links Based on Tier
-	if tier == "enterprise" {
-		output = getEnterpriseLinks(baseUri)
-	} else if tier == "creator" {
-		output = getCreatorLinks(baseUri)
-	} else if tier == "teams" {
-		output = getTeamsLinks(baseUri)
-	} else {
-		output = getStarterLinks(baseUri)
+	//Get Links Based on Tier, and replace link {BASEURI} with baseUri
+	for _, link := range allAppLinks {
+		if link.Tiers[tier] {
+			link.Url = strings.ReplaceAll(link.Url, "{BASEURI}", baseUri)
+			links = append(links, link)
+		}
 	}
 
 	//Sort in alphabetical order
-	slices.SortFunc(output, func(a, b AppLink) int {
+	slices.SortFunc(links, func(a, b AppLink) int {
 		return strings.Compare(a.Title, b.Title)
 	})
 
-	return output
+	return links
 }
 
-func getStarterLinks(baseUri string) []AppLink {
-	return []AppLink {
-		{
-			Title: "Panel",
-			Description: "Create & Manage Users",
-			Image: "/static/img/users.png",
-			Url: "https://panel." + baseUri + "/log_in/",
-			LDAP: true,
-			DocumentationUrl: "https://documentation.federated.computer/docs/core_applications/panel/",
+var allAppLinks = []AppLink{
+	{
+		Title: "Panel",
+		Description: "Create & Manage Users",
+		Image: "/static/img/users.png",
+		Url: "https://panel.{BASEURI}/log_in/",
+		LDAP: true,
+		DocumentationUrl: "https://documentation.federated.computer/docs/core_applications/panel/",
+		Tiers: map[string]bool {
+			"starter": true,
+			"creator": true,
+			"teams": true,
+			"enterprise": true,
+			"free": true,
+			"good": true,
+			"better": true,
+			"best": true,
 		},
-		{
-			Title: "Nextcloud",
-			Description: "Email, Files, Documents",
-			Image: "/static/img/nextcloud.png",
-			Url: "https://nextcloud." + baseUri,
-			LDAP: true,
-			DocumentationUrl: "https://docs.nextcloud.com/server/latest/user_manual/en/",
+	},
+	{
+		Title: "Nextcloud",
+		Description: "Email, Files, Documents",
+		Image: "/static/img/nextcloud.png",
+		Url: "https://nextcloud.{BASEURI}",
+		LDAP: true,
+		DocumentationUrl: "https://docs.nextcloud.com/server/latest/user_manual/en/",
+		Tiers: map[string]bool {
+			"starter": true,
+			"creator": true,
+			"teams": true,
+			"enterprise": true,
+			"free": false,
+			"good": true,
+			"better": true,
+			"best": true,
 		},
-		{
-			Title: "Vaultwarden",
-			Description: "Passwords",
-			Image: "/static/img/vaultwarden.png",
-			Url: "https://vaultwarden." + baseUri,
-			LDAP: false,
-			SpecialNote: "Must create your own admin user at setup.",
-			DocumentationUrl: "https://bitwarden.com/help/onboarding-and-succession/",
+	},
+	{
+		Title: "Vaultwarden",
+		Description: "Passwords",
+		Image: "/static/img/vaultwarden.png",
+		Url: "https://vaultwarden.{BASEURI}",
+		LDAP: false,
+		SpecialNote: "Must create your own admin user at setup.",
+		DocumentationUrl: "https://bitwarden.com/help/onboarding-and-succession/",
+		Tiers: map[string]bool {
+			"starter": true,
+			"creator": true,
+			"teams": true,
+			"enterprise": true,
+			"free": true,
+			"good": true,
+			"better": true,
+			"best": true,
 		},
-		{
-			Title: "Power DNS",
-			Description: "DNS Management",
-			Image: "/static/img/powerdns.png",
-			Url: "https://powerdns." + baseUri,
-			LDAP: false,
-			DocumentationUrl: "https://doc.powerdns.com/",
+	},
+	{
+		Title: "Power DNS",
+		Description: "DNS Management",
+		Image: "/static/img/powerdns.png",
+		Url: "https://powerdns.{BASEURI}",
+		LDAP: false,
+		DocumentationUrl: "https://doc.powerdns.com/",
+		Tiers: map[string]bool {
+			"starter": true,
+			"creator": true,
+			"teams": true,
+			"enterprise": true,
+			"free": true,
+			"good": true,
+			"better": true,
+			"best": true,
 		},
-		{
-			Title: "Roundcube",
-			Description: "Web Mail",
-			Image: "/static/img/roundcube.png",
-			Url: "https://roundcube." + baseUri,
-			LDAP: true,
-			DocumentationUrl: "https://roundcube.net/support/",
+	},
+	{
+		Title: "Roundcube",
+		Description: "Web Mail",
+		Image: "/static/img/roundcube.png",
+		Url: "https://roundcube.{BASEURI}",
+		LDAP: true,
+		DocumentationUrl: "https://roundcube.net/support/",
+		Tiers: map[string]bool {
+			"starter": true,
+			"creator": true,
+			"teams": true,
+			"enterprise": true,
+			"free": false,
+			"good": true,
+			"better": true,
+			"best": true,
 		},
-	}
+	},
+	{
+		Title: "Element",
+		Description: "Team Chat",
+		Image: "/static/img/element.png",
+		Url: "https://element.{BASEURI}",
+		LDAP: true,
+		DocumentationUrl: "https://element.io/user-guide",
+		Tiers: map[string]bool {
+			"starter": false,
+			"creator": true,
+			"teams": true,
+			"enterprise": true,
+			"free": false,
+			"good": false,
+			"better": true,
+			"best": true,
+		},
+	},
+	{
+		Title: "Wordpress",
+		Description: "Your Website",
+		Image: "/static/img/wordpress.png",
+		Url: "https://{BASEURI}/wp-admin",
+		LDAP: false,
+		DocumentationUrl: "https://wordpress.org/documentation/",
+		Tiers: map[string]bool {
+			"starter": false,
+			"creator": true,
+			"teams": true,
+			"enterprise": true,
+			"free": false,
+			"good": true,
+			"better": true,
+			"best": true,
+		},
+	},
+	{
+		Title: "Espo CRM",
+		Description: "Customer Relationship Manager",
+		Image: "/static/img/espo.png",
+		Url: "https://espocrm.{BASEURI}",
+		LDAP: true,
+		DocumentationUrl: "https://docs.espocrm.com/user-guide/sales-management/",
+		Tiers: map[string]bool {
+			"starter": false,
+			"creator": false,
+			"teams": true,
+			"enterprise": true,
+			"free": false,
+			"good": false,
+			"better": true,
+			"best": true,
+		},
+	},
+	{
+		Title: "FreeScout",
+		Description: "Customer Help Desk",
+		Image: "/static/img/freescout.png",
+		Url: "https://freescout.{BASEURI}",
+		LDAP: false,
+		DocumentationUrl: "https://github.com/freescout-help-desk/freescout/wiki/FAQ",
+		Tiers: map[string]bool {
+			"starter": false,
+			"creator": false,
+			"teams": true,
+			"enterprise": true,
+			"free": false,
+			"good": false,
+			"better": false,
+			"best": true,
+		},
+	},
+	{
+		Title: "Jitsi",
+		Description: "Video Chat",
+		Image: "/static/img/jitsi.png",
+		Url: "https://jitsi.{BASEURI}",
+		LDAP: true,
+		DocumentationUrl: "https://jitsi.github.io/handbook/docs/intro/",
+		Tiers: map[string]bool {
+			"starter": false,
+			"creator": false,
+			"teams": false,
+			"enterprise": true,
+			"free": false,
+			"good": false,
+			"better": true,
+			"best": true,
+		},
+	},
+	{
+		Title: "Listmonk",
+		Description: "Email Marketing",
+		Image: "/static/img/listmonk.png",
+		Url: "https://listmonk.{BASEURI}",
+		LDAP: false,
+		DocumentationUrl: "https://listmonk.app/docs/concepts/",
+		Tiers: map[string]bool {
+			"starter": false,
+			"creator": false,
+			"teams": false,
+			"enterprise": true,
+			"free": false,
+			"good": false,
+			"better": false,
+			"best": true,
+		},
+	},
+	{
+		Title: "Baserow",
+		Description: "Visual Databases",
+		Image: "/static/img/baserow.png",
+		Url: "https://baserow.{BASEURI}",
+		LDAP: false,
+		DocumentationUrl: "https://baserow.io/user-docs",
+		Tiers: map[string]bool {
+			"starter": false,
+			"creator": false,
+			"teams": false,
+			"enterprise": true,
+			"free": false,
+			"good": false,
+			"better": false,
+			"best": true,
+		},
+	},
+	{
+		Title: "Bookstack",
+		Description: "Wiki Knowledgebase",
+		Image: "/static/img/bookstack.png",
+		Url: "https://bookstack.{BASEURI}",
+		LDAP: false,
+		DocumentationUrl: "https://www.bookstackapp.com/docs/",
+		Tiers: map[string]bool {
+			"starter": false,
+			"creator": false,
+			"teams": false,
+			"enterprise": true,
+			"free": false,
+			"good": false,
+			"better": false,
+			"best": true,
+		},
+	},
+	{
+		Title: "Gitea",
+		Description: "GIT Source Control",
+		Image: "/static/img/gitea.png",
+		Url: "https://gitea.{BASEURI}",
+		LDAP: false,
+		DocumentationUrl: "https://docs.gitea.com/category/usage",
+		Tiers: map[string]bool {
+			"starter": false,
+			"creator": false,
+			"teams": false,
+			"enterprise": true,
+			"free": false,
+			"good": false,
+			"better": false,
+			"best": true,
+		},
+	},
+	{
+		Title: "Castopod",
+		Description: "Podcast Distribution",
+		Image: "/static/img/castopod.png",
+		Url: "https://castopod.{BASEURI}/cp-auth/login",
+		LDAP: false,
+		Tiers: map[string]bool {
+			"starter": false,
+			"creator": false,
+			"teams": false,
+			"enterprise": true,
+			"free": false,
+			"good": false,
+			"better": false,
+			"best": false,
+		},
+	},	
 }
-
-func getCreatorLinks(baseUri string) []AppLink {
-	creatorLinks := []AppLink {
-		{
-			Title: "Element",
-			Description: "Team Chat",
-			Image: "/static/img/element.png",
-			Url: "https://element." + baseUri,
-			LDAP: true,
-			DocumentationUrl: "https://element.io/user-guide",
-		},
-		{
-			Title: "Wordpress",
-			Description: "Your Website",
-			Image: "/static/img/wordpress.png",
-			Url: "https://" + baseUri + "/wp-admin",
-			LDAP: false,
-			DocumentationUrl: "https://wordpress.org/documentation/",
-		},
-	}
-
-	return append(creatorLinks, getStarterLinks(baseUri)...)
-}
-
-func getTeamsLinks(baseUri string) []AppLink {
-	teamsLinks := []AppLink {
-		{
-			Title: "Espo CRM",
-			Description: "Customer Relationship Manager",
-			Image: "/static/img/espo.png",
-			Url: "https://espocrm." + baseUri,
-			LDAP: true,
-			DocumentationUrl: "https://docs.espocrm.com/user-guide/sales-management/",
-		},
-		{
-			Title: "FreeScout",
-			Description: "Customer Help Desk",
-			Image: "/static/img/freescout.png",
-			Url: "https://freescout." + baseUri,
-			LDAP: false,
-			DocumentationUrl: "https://github.com/freescout-help-desk/freescout/wiki/FAQ",
-		},
-	}
-
-	return append(teamsLinks, getCreatorLinks(baseUri)...)
-}
-
-func getEnterpriseLinks(baseUri string) []AppLink {
-	enterpriseLinks := []AppLink{
-		{
-			Title: "Jitsi",
-			Description: "Video Chat",
-			Image: "/static/img/jitsi.png",
-			Url: "https://jitsi." + baseUri,
-			LDAP: true,
-			DocumentationUrl: "https://jitsi.github.io/handbook/docs/intro/",
-		},
-		{
-			Title: "Listmonk",
-			Description: "Email Marketing",
-			Image: "/static/img/listmonk.png",
-			Url: "https://listmonk." + baseUri,
-			LDAP: false,
-			DocumentationUrl: "https://listmonk.app/docs/concepts/",
-		},
-		{
-			Title: "Baserow",
-			Description: "Visual Databases",
-			Image: "/static/img/baserow.png",
-			Url: "https://baserow." + baseUri,
-			LDAP: false,
-			DocumentationUrl: "https://baserow.io/user-docs",
-		},
-		{
-			Title: "Bookstack",
-			Description: "Wiki Knowledgebase",
-			Image: "/static/img/bookstack.png",
-			Url: "https://bookstack." + baseUri,
-			LDAP: false,
-			DocumentationUrl: "https://www.bookstackapp.com/docs/",
-		},
-		{
-			Title: "Gitea",
-			Description: "GIT Source Control",
-			Image: "/static/img/gitea.png",
-			Url: "https://gitea." + baseUri,
-			LDAP: false,
-			DocumentationUrl: "https://docs.gitea.com/category/usage",
-		},
-		{
-			Title: "Castopod",
-			Description: "Podcast Distribution",
-			Image: "/static/img/castopod.png",
-			Url: "https://castopod." + baseUri + "/cp-auth/login",
-			LDAP: false,
-		},	
-	}
-
-	return append(enterpriseLinks, getTeamsLinks(baseUri)...)
-}
\ No newline at end of file
diff --git a/cmd/web/handlers.go b/cmd/web/handlers.go
index 156ec9a..3802dc3 100644
--- a/cmd/web/handlers.go
+++ b/cmd/web/handlers.go
@@ -6,10 +6,8 @@ import (
 )
 
 func (app *application) home(writer http.ResponseWriter, request *http.Request) {
-	appLinks := getAppLinks(app.tier, app.domain)
-
 	data := templateData{ 
-		AppLinks: appLinks,
+		AppLinks: app.appLinks,
 		Tier: app.tier,
 		BaseUri: app.domain,
 	}
@@ -26,9 +24,9 @@ func (app *application) vpn(writer http.ResponseWriter, request *http.Request) {
 }
 
 func (app *application) appList(writer http.ResponseWriter, request *http.Request) {
-	appLinks := getAppLinks(app.tier, app.domain)
-    writer.Header().Set("Content-Type", "application/json")
-	data, err := json.Marshal(appLinks)
+	writer.Header().Set("Content-Type", "application/json")
+	
+	data, err := json.Marshal(app.appLinks)
 
 	if err != nil {
 		app.serverError(writer, request, err)
diff --git a/cmd/web/main.go b/cmd/web/main.go
index 3fb71d5..aad91a9 100644
--- a/cmd/web/main.go
+++ b/cmd/web/main.go
@@ -12,6 +12,7 @@ type application struct {
 	templateCache map[string]*template.Template
 	tier string
 	domain string
+	appLinks []AppLink
 }
 
 func main() {
@@ -22,7 +23,7 @@ func main() {
 	//Get env variables
 	tier := os.Getenv("TIER")
 	if len(tier) == 0 {
-		tier = "starter"
+		tier = "good"
 	}
 	domain := os.Getenv("DOMAIN")
 	if len(domain) == 0 {
@@ -35,14 +36,17 @@ func main() {
 		logger.Error(err.Error())
 		os.Exit(1)
 	}
+	//Set up app links cache
+	appLinks := getAppLinks(tier, domain)
 	//Set up application data
 	app := application {
 		logger: logger,
 		templateCache: templateCache,
 		tier: tier,
 		domain: domain,
+		appLinks: appLinks,
 	}
-
+	//start server
 	err = http.ListenAndServe(":8080", app.routes())
 	logger.Error(err.Error())
 	os.Exit(1)