diff --git a/app/src/main/java/replete/Main.kt b/app/src/main/java/replete/Main.kt
index a60e314..79f0d95 100644
--- a/app/src/main/java/replete/Main.kt
+++ b/app/src/main/java/replete/Main.kt
@@ -292,8 +292,13 @@ class MainActivity : AppCompatActivity() {
     }
 
     var evalButton: Button? = null
+    var openBracketButton: Button? = null
+    var historyUpButton: Button? = null
+    var historyDownButton: Button? = null
+
     var inputField: EditText? = null
 
+
     var uiHandler: Handler? = null
     var thHandler: Handler? = null
     var ht: HandlerThread? = null
@@ -329,6 +334,9 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        var historyPosition = 0
+        var sessionList = ArrayList<String>()
+
         uiHandler = object : Handler(Looper.getMainLooper()) {
             override fun handleMessage(msg: Message) {
                 when (msg.what) {
@@ -348,9 +356,12 @@ class MainActivity : AppCompatActivity() {
         setDeviceType()
         setContentView(R.layout.activity_main)
 
-        inputField = findViewById(R.id.input)
         val replHistory: ListView = findViewById(R.id.repl_history)
+
+        inputField = findViewById(R.id.input)
         evalButton = findViewById(R.id.eval_button)
+        historyUpButton = findViewById(R.id.history_up)
+        historyDownButton = findViewById(R.id.history_down)
 
         inputField!!.hint = "Type in here"
         inputField!!.setHintTextColor(Color.GRAY)
@@ -358,6 +369,8 @@ class MainActivity : AppCompatActivity() {
         evalButton!!.isEnabled = false
         evalButton!!.setTextColor(Color.GRAY)
 
+        openBracketButton = findViewById(R.id.insert_open_bracket)
+
         adapter = HistoryAdapter(this, R.layout.list_item, replHistory)
 
         replHistory.adapter = adapter
@@ -460,6 +473,8 @@ class MainActivity : AppCompatActivity() {
             val input = inputField!!.text.toString()
             inputField!!.text.clear()
             sendUIMessage(Messages.ADD_INPUT_ITEM, input)
+            sessionList.add(input)
+            historyPosition = sessionList.size
 
             try {
                 if (isMacro(input)) {
@@ -472,6 +487,28 @@ class MainActivity : AppCompatActivity() {
             }
 
         }
+        openBracketButton!!.setOnClickListener { v ->
+            val cursorPos = inputField!!.getSelectionStart()
+            inputField!!.text.insert(cursorPos ,"(")
+
+        }
+        historyUpButton!!.setOnClickListener { v ->
+            if (historyPosition > 0) {
+                historyPosition--
+                val histItem = sessionList.get(historyPosition)
+                inputField!!.setText(histItem)
+            }
+        }
+        historyDownButton!!.setOnClickListener { v ->
+            if (historyPosition < sessionList.size -1) {
+                historyPosition++
+                val histItem = sessionList.get(historyPosition)
+                inputField!!.setText(histItem)
+            } else {
+                inputField!!.text.clear()
+                historyPosition = sessionList.size
+            }
+        }
 
         sendUIMessage(
             Messages.ADD_INPUT_ITEM, "\nClojureScript ${getClojureScriptVersion()}\n" +
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1a66a05..eb78119 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -14,28 +14,64 @@
             android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             app:layout_constraintBottom_toTopOf="@+id/input" android:dividerHeight="0dp" android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp">
+            android:layout_marginRight="8dp" app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintVertical_bias="1.0">
     </ListView>
     <Button
             android:text="Eval"
             android:layout_width="64dp"
             android:layout_height="0dp" android:id="@+id/eval_button" android:layout_weight="1"
             style="@style/Widget.AppCompat.Button.Borderless.Colored"
-            android:textColor="@android:color/holo_blue_dark" android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp" app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginBottom="8dp"
-            app:layout_constraintTop_toBottomOf="@+id/repl_history"/>
+            android:textColor="@android:color/holo_blue_dark" android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp" app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/repl_history"
+            android:layout_marginTop="2dp" app:layout_constraintBottom_toTopOf="@+id/toolbar"
+            android:layout_marginBottom="2dp"/>
     <EditText
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:inputType="text|textMultiLine|textNoSuggestions"
             android:ems="10"
-            android:id="@+id/input" android:layout_marginBottom="8dp"
-            app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent"
+            android:id="@+id/input"
+            app:layout_constraintStart_toStartOf="parent"
             android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
             app:layout_constraintEnd_toStartOf="@+id/eval_button"
             android:layout_marginEnd="8dp" android:layout_marginRight="8dp" android:typeface="monospace"
-            android:textSize="14sp" android:textColor="@android:color/black"/>
+            android:textSize="14sp" android:textColor="@android:color/black"
+            app:layout_constraintHorizontal_bias="0.0" android:singleLine="true" android:layout_marginBottom="53dp"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+    <android.support.v7.widget.Toolbar
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="#ff0099cc"
+            android:theme="?attr/actionBarTheme"
+            android:minHeight="52dp" android:id="@+id/toolbar"
+            app:layout_constraintTop_toBottomOf="@+id/input"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
+    />
+    <Button
+            android:text="("
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" android:id="@+id/insert-open-bracket"
+            app:layout_constraintTop_toTopOf="@+id/toolbar" app:layout_constraintBottom_toBottomOf="@+id/toolbar"
+            android:layout_marginBottom="2dp" app:layout_constraintStart_toStartOf="@+id/toolbar"
+            android:layout_marginLeft="2dp" android:layout_marginStart="2dp" android:layout_marginTop="2dp"/>
+    <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" android:id="@+id/history-up"
+            app:layout_constraintTop_toTopOf="@+id/toolbar" app:layout_constraintBottom_toBottomOf="@+id/toolbar"
+            android:layout_marginBottom="2dp"
+            android:layout_marginTop="2dp"
+            app:layout_constraintVertical_bias="0.0" app:layout_constraintStart_toEndOf="@+id/insert-open-bracket"
+            android:layout_marginStart="8dp" android:layout_marginLeft="8dp" android:text="▲"/>
+    <Button
+            android:text="▼"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" android:id="@+id/history-down"
+            app:layout_constraintTop_toTopOf="@+id/toolbar" app:layout_constraintBottom_toBottomOf="@+id/toolbar"
+            android:layout_marginBottom="2dp"
+            android:layout_marginLeft="2dp" android:layout_marginStart="2dp" android:layout_marginTop="2dp"
+            app:layout_constraintVertical_bias="1.0" app:layout_constraintStart_toEndOf="@+id/history-up"/>
 
 </android.support.constraint.ConstraintLayout>