diff --git a/tharanor_letter.py b/tharanor_letter.py
index c06e9f4..b9b3fc2 100644
--- a/tharanor_letter.py
+++ b/tharanor_letter.py
@@ -24,9 +24,9 @@ def query_db(query, query_args=(), one=False):
 
 @app.route('/')
 def index():
-    senders = query_db('SELECT * FROM sender')
-    recipients = query_db('SELECT * FROM recipient')
-    states = query_db('SELECT * FROM state')
+    senders = query_db('SELECT * FROM sender ORDER BY name')
+    recipients = query_db('SELECT * FROM recipient ORDER BY name')
+    states = query_db('SELECT * FROM state ORDER BY name')
     return render_template('index.html', senders=senders, recipients=recipients, states=states)
 
 
@@ -46,14 +46,14 @@ def generate():
 def api_add_sender():
     name = request.form['name']
     kuralie = request.form['kuralie']
-    siegel = request.files['logo']
-    signatur = request.files['signature']
+    siegel = request.files['siegel']
+    signatur = request.files['signatur']
 
     siegel_filename = secure_filename(siegel.filename)
-    siegel.save(app.config['UPLOAD_FOLDER'] / siegel)
+    siegel.save(str(app.config['UPLOAD_FOLDER'] / siegel_filename))
 
     sig_filename = secure_filename(signatur.filename)
-    signatur.save(app.config['UPLOAD_FOLDER'] / sig_filename)
+    signatur.save(str(app.config['UPLOAD_FOLDER'] / sig_filename))
 
     query_db('INSERT INTO sender (name, kuralie, siegel, signatur) VALUES (?, ?, ?, ?)',
              [name, kuralie, siegel_filename, sig_filename])
@@ -78,7 +78,7 @@ def api_add_state():
 
 @app.route('/api/senders', methods=['GET'])
 def api_get_senders():
-    senders = query_db('SELECT id, name FROM sender')
+    senders = query_db('SELECT id, name FROM sender ORDER BY name')
     return jsonify([dict(row) for row in senders])
 
 
@@ -92,9 +92,9 @@ def api_get_sender(sender_id):
 def api_get_recipients():
     state_id = request.args.get('state_id')
     if state_id and state_id != 'all':
-        recipients = query_db('SELECT id, name FROM recipient WHERE state_id = ?', [state_id])
+        recipients = query_db('SELECT id, name FROM recipient WHERE state_id = ? ORDER BY name', [state_id])
     else:
-        recipients = query_db('SELECT id, name FROM recipient')
+        recipients = query_db('SELECT id, name FROM recipient ORDER BY name')
     return jsonify([dict(row) for row in recipients])
 
 
@@ -106,7 +106,7 @@ def api_get_recipient(recipient_id):
 
 @app.route('/api/states', methods=['GET'])
 def api_get_states():
-    states = query_db('SELECT id, name FROM state')
+    states = query_db('SELECT id, name FROM state ORDER BY name')
     return jsonify([dict(row) for row in states])
 
 
@@ -127,9 +127,9 @@ def api_edit_sender(sender_id):
     sig_filename = secure_filename(signatur.filename) if signatur else None
 
     if siegel:
-        siegel.save(app.config['UPLOAD_FOLDER'] / siegel_filename)
+        siegel.save(str(app.config['UPLOAD_FOLDER'] / siegel_filename))
     if signatur:
-        signatur.save(app.config['UPLOAD_FOLDER'] / sig_filename)
+        signatur.save(str(app.config['UPLOAD_FOLDER'] / sig_filename))
 
     query_db('UPDATE sender SET name = ?, kuralie = ?, siegel = ?, signatur = ? WHERE id = ?',
              [name, kuralie, siegel_filename, sig_filename, sender_id])