diff --git a/cmd/cli.go b/cmd/cli.go
index 7fd46a27..df13724f 100644
--- a/cmd/cli.go
+++ b/cmd/cli.go
@@ -22,14 +22,15 @@ const (
 )
 
 func CatchCLI(args []string) {
+	dir := utils.Dir()
 	switch args[1] {
 	case "version":
 		fmt.Printf("Statup v%v\n", VERSION)
 	case "assets":
 		core.RenderBoxes()
-		core.CreateAllAssets(".")
+		core.CreateAllAssets(dir)
 	case "sass":
-		core.CompileSASS(".")
+		core.CompileSASS(dir)
 	case "update":
 		gitCurrent, err := CheckGithubUpdates()
 		if err != nil {
@@ -83,10 +84,6 @@ func CatchCLI(args []string) {
 	}
 }
 
-func CheckUpdates() {
-
-}
-
 func RunOnce() {
 	var err error
 	core.Configs, err = core.LoadConfig()
diff --git a/core/assets.go b/core/assets.go
index 6fa85de9..9452b6a5 100644
--- a/core/assets.go
+++ b/core/assets.go
@@ -31,7 +31,7 @@ func CopyToPublic(box *rice.Box, folder, file string) {
 }
 
 func MakePublicFolder(folder string) {
-	utils.Log(1, fmt.Sprintf("Creating folder '%v' in current directory...", folder))
+	utils.Log(1, fmt.Sprintf("Creating folder '%v'", folder))
 	if _, err := os.Stat(folder); os.IsNotExist(err) {
 		err = os.MkdirAll(folder, 0755)
 		if err != nil {
@@ -106,18 +106,18 @@ func CreateAllAssets(folder string) error {
 	MakePublicFolder(folder + "/assets/js")
 	MakePublicFolder(folder + "/assets/css")
 	MakePublicFolder(folder + "/assets/scss")
-	MakePublicFolder(folder + "/assets/emails")
-	utils.Log(1, "Inserting scss, css, emails, and javascript files into assets..")
+	utils.Log(1, "Inserting scss, css, and javascript files into assets folder")
 	CopyToPublic(ScssBox, folder+"/assets/scss", "base.scss")
 	CopyToPublic(ScssBox, folder+"/assets/scss", "variables.scss")
 	CopyToPublic(CssBox, folder+"/assets/css", "bootstrap.min.css")
+	CopyToPublic(CssBox, folder+"/assets/css", "base.css")
 	CopyToPublic(JsBox, folder+"/assets/js", "bootstrap.min.js")
 	CopyToPublic(JsBox, folder+"/assets/js", "Chart.bundle.min.js")
 	CopyToPublic(JsBox, folder+"/assets/js", "jquery-3.3.1.slim.min.js")
 	CopyToPublic(JsBox, folder+"/assets/js", "main.js")
 	CopyToPublic(JsBox, folder+"/assets/js", "setup.js")
-	CopyToPublic(TmplBox, folder+"/assets/", "robots.txt")
-	CopyToPublic(TmplBox, folder+"/assets/", "favicon.ico")
+	CopyToPublic(TmplBox, folder+"/assets", "robots.txt")
+	CopyToPublic(TmplBox, folder+"/assets", "favicon.ico")
 	utils.Log(1, "Compiling CSS from SCSS style...")
 	err := utils.Log(1, "Statup assets have been inserted")
 	return err