diff --git a/Linux/PreferencesWindow.pyc b/Linux/PreferencesWindow.pyc
deleted file mode 100644
index b06a4fb..0000000
Binary files a/Linux/PreferencesWindow.pyc and /dev/null differ
diff --git a/Linux/Tentia.py b/Linux/Tentia.py
index 2364c28..733304c 100755
--- a/Linux/Tentia.py
+++ b/Linux/Tentia.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 from gi.repository import Gtk
-import PreferencesWindow
+import TentiaWindows
 
 class Tentia:
 
@@ -10,10 +10,10 @@ class Tentia:
 		Gtk.main()
 
 	def quit(self):
-		Gtk.main_quit
+		Gtk.main_quit()
 
 	def setup_preferences_window(self):
-		self.preferences_window = PreferencesWindow(self)
+		self.preferences_window = TentiaWindows.Preferences(self)
 
 		
 if __name__ == "__main__":
diff --git a/Linux/TentiaWindows.py b/Linux/TentiaWindows.py
new file mode 100644
index 0000000..6a7a62e
--- /dev/null
+++ b/Linux/TentiaWindows.py
@@ -0,0 +1,41 @@
+from gi.repository import Gtk
+import webkit
+
+class Preferences(Gtk.Window):
+
+	def __init__(self, app):
+
+		self.app = app
+		Gtk.Window.__init__(self, title="Preferences")
+		self.connect("delete-event", self.quit)
+
+		self.login_button = Gtk.Button(label="Login")
+		self.login_button.connect("clicked", self.on_login_button_clicked)
+		self.add(self.login_button)
+
+	def quit(self):
+		self.hide_all()
+		self.app.quit(self)
+
+	def on_login_button_clicked(self, widget):
+		print "Login"
+
+
+class Timeline(Gtk.Window):
+
+	def __init(self, app):
+		self.app = app
+		Gtk.Window.__init__(self, title="Tentia")
+		self.connect("delete-event", self.quit)
+		self.web_view = webkit.WebView()
+
+		scroller = gtk.StrolledWindow()
+		self.add(scroller)
+		scroller.show()
+		scroller.add(self.web_view)
+		self.web_view.show()
+		self.web_view.open("http://google.com")
+
+	def quit(self)
+		self.hide_all()
+		self.app.quit(self)