diff --git a/app.py b/app.py
index c7bca28..dbaf0d8 100755
--- a/app.py
+++ b/app.py
@@ -136,11 +136,11 @@ class MainWindow(QMainWindow):
       open.setShortcut("Ctrl+o")
       file.addAction(open)
 
-      self.save_action = QAction("&Save",self)
-      self.save_action.setShortcut("Ctrl+s")
+      self.save_action = QAction("&Save Project as",self)
+      self.save_action.setShortcut("Ctrl+Shift+s")
       file.addAction(self.save_action)
-      if not self.core.tempcwd:
-         self.save_action.setEnabled(False)
+      # if not self.core.tempcwd:
+      #    self.save_action.setEnabled(False)
 
       quit = QAction("&Quit",self)
       quit.setShortcut("Ctrl+q")
@@ -178,7 +178,7 @@ class MainWindow(QMainWindow):
          self.newprojectdialogue()
       elif q.text() == "&Open":
          self.openprojectdialogue()
-      elif q.text() == "&Save":
+      elif q.text() == "&Save Project as":
          self.saveprojectdialogue()
       elif q.text() == "&Quit":
          self.quit()
@@ -204,7 +204,7 @@ class MainWindow(QMainWindow):
       try:
          if not os.path.isdir(projectname[0]):
             self.core.saveproject(projectname[0])
-            self.save_action.setEnabled(False)
+            # self.save_action.setEnabled(False)
             if quit:
                self.quit()
          else:
diff --git a/classes/view.py b/classes/view.py
index 66c9d2c..9d58c5e 100644
--- a/classes/view.py
+++ b/classes/view.py
@@ -1,12 +1,12 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-import sys, os
+import sys, os, re
 
 from PyQt5 import QtCore
 from PyQt5.QtCore import QUrl
-from PyQt5.QtGui import QFont, QSyntaxHighlighter
-from PyQt5.QtWidgets import QWidget, QLabel, QTabWidget, QVBoxLayout, QHBoxLayout, QSplitter, QPlainTextEdit
+from PyQt5.QtGui import QKeySequence, QFont, QSyntaxHighlighter
+from PyQt5.QtWidgets import QWidget, QLabel, QTabWidget, QVBoxLayout, QHBoxLayout, QSplitter, QPlainTextEdit, QShortcut
 from PyQt5.QtWebKit import QWebSettings
 from PyQt5.QtWebKitWidgets import QWebView, QWebInspector
 
@@ -27,10 +27,43 @@ class WebkitInspector(QWebInspector):
       self.setPage(self.webkitview.page())
       # TODO: webkitinspector is disappearing when chaging tabs
 
-class CodeEditor(QWidget):
-   def __init__(self, core):
+class CodeEditor(QPlainTextEdit):
+   def __init__(self, core, tabs, file=None):
       super(CodeEditor, self).__init__()
       self.core = core
+      self.tabs = tabs
+      # self.file = file
+      self.file = os.path.join(self.core.cwd,file)
+
+      self.insertPlainText(open(self.file, 'r').read())
+      self.changed = False
+      self.textChanged.connect(self.onTextChanged)
+
+      self.shortcut = QShortcut(QKeySequence("Ctrl+s"), self)
+      self.shortcut.activated.connect(self.save)
+
+   def onTextChanged(self):
+      # print('textChanged')
+      # print(self.toPlainText())
+      # open(self.file, 'w').write(self.toPlainText())
+      if not self.changed:
+         self.changed = True
+         i = self.tabs.currentIndex()
+         self.tabs.setTabText(i, "* "+self.tabs.tabText(i))
+
+   def save(self):
+      if self.changed:
+         open(self.file, 'w').write(self.toPlainText())
+         i = self.tabs.currentIndex()
+         self.tabs.setTabText(i, re.sub(r'^\*\s', '', self.tabs.tabText(i)))
+         self.changed = False
+         # TODO: how to combine file save and project save
+
+
+class Editor(QWidget):
+   def __init__(self, core):
+      super(Editor, self).__init__()
+      self.core = core
 
       self.layout = QVBoxLayout(self)
       self.layout.setContentsMargins(0,0,0,0)
@@ -38,16 +71,8 @@ class CodeEditor(QWidget):
       # Initialize tab screen
       self.tabs = QTabWidget()
 
-      self.scsstab = QPlainTextEdit()
-      self.scssfile = open(os.path.join(self.core.cwd,'assets/scss/styles.scss'))
-      scssstr = self.scssfile.read()
-      self.scsstab.insertPlainText(scssstr)
-
-      self.jstab = QPlainTextEdit()
-      self.jsfile = open(os.path.join(self.core.cwd,'assets/js/script.js'))
-      jsstr = self.jsfile.read()
-      self.jstab.insertPlainText(jsstr)
-
+      self.scsstab = CodeEditor(core, self.tabs, 'assets/scss/styles.scss')
+      self.jstab = CodeEditor(core, self.tabs, 'assets/js/script.js')
 
       # Add tabs
       self.tabs.addTab(self.scsstab,"scss")
@@ -88,8 +113,8 @@ class ViewStack(QWidget):
       hsplitter = QSplitter(QtCore.Qt.Horizontal)
       hsplitter.addWidget(vsplitter)
 
-      self.codeeditor = CodeEditor(core)
-      hsplitter.addWidget(self.codeeditor)
+      self.editor = Editor(core)
+      hsplitter.addWidget(self.editor)
 
       hbox.addWidget(hsplitter)