diff --git a/progit/templates/issue.html b/progit/templates/issue.html
index f919462..2f492b9 100644
--- a/progit/templates/issue.html
+++ b/progit/templates/issue.html
@@ -27,6 +27,11 @@
 
 {% block repo %}
 
+{% if authenticated and form %}
+  <form action="{{ url_for('update_issue', username=username,
+           repo=repo.name, issueid=issueid) }}" method="post">
+{% endif %}
+
 <h2>
     <span class="issueid">#{{ issueid }}</span> {{ issue.title }}
     {% if authenticated %}
@@ -36,12 +41,9 @@
     {% endif %}
     <aside class="issue_action">
     {% if authenticated and form %}
-      <form action="{{ url_for('view_issue', username=username,
-               repo=repo.name, issueid=issueid) }}" method="post">
         {{ render_field(form.status) }}
         <input type="submit" class="submit positive button" value="Update">
         {{ form.csrf_token }}
-      </form>
     {% else %}
         Status: {{ issue.status }}
     {% endif %}
@@ -55,15 +57,8 @@
                repo=repo.name, tags=tag.tag) }}">
         {{ tag.tag }}</a>{% if not loop.last %},{% endif %}
     {% endfor %}
-    {% if authenticated and form_tag %}
-      <form action="{{ url_for('add_tag_issue', username=username,
-               repo=repo.name, issueid=issueid) }}" method="post"
-               class="tag_form">
+    {% if authenticated %}
         <input id="tag" type="text" value="" placeholder="tag1, tag2" name="tag">
-        <input id="add_tags" type="submit"
-            class="submit positive button" value="Add">
-        {{ form_tag.csrf_token }}
-      </form>
     {% endif %}
 </section>
 
@@ -74,22 +69,8 @@
                repo=repo.name, assignee=issue.assignee.username) }}">
         {{ issue.assignee.username }}</a>
     {% endif %}
-    {% if authenticated and form_tag %}
-      <form action="{{ url_for('add_assignee_issue', username=username,
-               repo=repo.name, issueid=issueid) }}" method="post"
-               class="tag_form">
+    {% if authenticated %}
         <input type="hidden" value="{{ g.fas_user.username }}" name="assignee">
-        <input id="take_assignement" type="submit"
-            class="submit positive button" value="Take">
-        {{ form_tag.csrf_token }}
-      </form>
-      <form action="{{ url_for('add_assignee_issue', username=username,
-               repo=repo.name, issueid=issueid) }}" method="post"
-               class="tag_form">
-        <input type="hidden" value="" name="assignee">
-        <input type="submit" class="submit positive button" value="Reset">
-        {{ form_tag.csrf_token }}
-      </form>
     {% endif %}
 </section>
 
@@ -103,16 +84,9 @@
     {% endfor %}
     {% endif %}
 
-    {% if authenticated and form_tag %}
-      <form action="{{ url_for('add_dependent_issue', username=username,
-               repo=repo.name, issueid=issueid, issuetype='parent') }}" method="post"
-               class="tag_form">
+    {% if authenticated %}
         <input id="depends" type="text"
             placeholder="issue blocked" name="depends">
-        <input id="add_blocks" type="submit"
-            class="submit positive button" value="Add">
-        {{ form_tag.csrf_token }}
-      </form>
     {% endif %}
 </section>
 
@@ -126,16 +100,9 @@
     {% endfor %}
     {% endif %}
 
-    {% if authenticated and form_tag %}
-      <form action="{{ url_for('add_dependent_issue', username=username,
-               repo=repo.name, issueid=issueid, issuetype='child') }}" method="post"
-               class="tag_form">
+    {% if authenticated %}
         <input id="depends" type="text"
             placeholder="issue depending" name="depends">
-        <input id="add_depends" type="submit"
-            class="submit positive button" value="Add">
-        {{ form_tag.csrf_token }}
-      </form>
     {% endif %}
 </section>
 
@@ -148,7 +115,7 @@
 {% endif %}
 
 <section class="issue_comment add_comment">
-{% if authenticated %}
+{% if authenticated and form %}
   <header>
     <label for="comment">Add new comment</label>
     (supports the <a href="http://daringfireball.net/projects/markdown/syntax"
@@ -160,18 +127,13 @@
       <li><a href="#preview">Preview</a></li>
     </ul>
     <div id="edit">
-      <form action="{{ url_for('add_comment_issue', username=username,
-                       repo=repo.name, issueid=issueid) }}" method="post">
-
-        <div>
-          <textarea id="comment" name="comment" placeholder="Enter your comment here"></textarea>
-          {{ form_comment.csrf_token }}
-        </div>
-        <div>
-          <input type="submit" class="submit positive button" value="Comment">
-          <input type="button" value="Clear" id="clear_comment" />
-        </div>
-      </form>
+      <div>
+        <textarea id="comment" name="comment" placeholder="Enter your comment here"></textarea>
+      </div>
+      <div>
+        <input type="submit" class="submit positive button" value="Comment">
+        <input type="button" value="Clear" id="clear_comment" />
+      </div>
     </div>
     <div id="preview">
     </div>
@@ -181,6 +143,10 @@
 {% endif %}
 </section>
 
+{% if authenticated and form %}
+  </form>
+{% endif %}
+
 {% endblock %}
 
 {% block jscripts %}
diff --git a/progit/ui/issues.py b/progit/ui/issues.py
index 619da4a..c50ef8f 100644
--- a/progit/ui/issues.py
+++ b/progit/ui/issues.py
@@ -29,10 +29,10 @@ from progit import (APP, SESSION, LOG, __get_file_in_tree, cla_required,
 
 # URLs
 
-@APP.route('/<repo>/issue/<int:issueid>/add', methods=('GET', 'POST'))
-@APP.route('/fork/<username>/<repo>/issue/<int:issueid>/add',
+@APP.route('/<repo>/issue/<int:issueid>/update', methods=('GET', 'POST'))
+@APP.route('/fork/<username>/<repo>/issue/<int:issueid>/update',
            methods=('GET', 'POST'))
-def add_comment_issue(repo, issueid, username=None):
+def update_issue(repo, issueid, username=None):
     ''' Add a comment to an issue. '''
     repo = progit.lib.get_project(SESSION, repo, user=username)
 
@@ -47,179 +47,84 @@ def add_comment_issue(repo, issueid, username=None):
     if issue is None or issue.project != repo:
         flask.abort(404, 'Issue not found')
 
-    form = progit.forms.AddIssueCommentForm()
+    status = progit.lib.get_issue_statuses(SESSION)
+    form = progit.forms.UpdateIssueForm(status=status)
+
     if form.validate_on_submit():
         comment = form.comment.data
+        depends = form.depends.data
+        assignee = form.assignee.data
+        new_status = form.status.data
+        tags = [
+            tag.strip()
+            for tag in form.tag.data.split(',')
+            if tag.strip()]
 
         try:
-            message = progit.lib.add_issue_comment(
-                SESSION,
-                issue=issue,
-                comment=comment,
-                user=flask.g.fas_user.username,
-                ticketfolder=APP.config['TICKETS_FOLDER'],
-            )
-            SESSION.commit()
-            flask.flash(message)
-        except SQLAlchemyError, err:  # pragma: no cover
-            SESSION.rollback()
-            APP.logger.exception(err)
-            flask.flash(str(err), 'error')
-
-    return flask.redirect(flask.url_for(
-        'view_issue', username=username, repo=repo.name, issueid=issueid))
-
-
-@APP.route('/<repo>/issue/<int:issueid>/tag', methods=['POST'])
-@APP.route('/fork/<username>/<repo>/issue/<int:issueid>/tag',
-           methods=['POST'])
-@cla_required
-def add_tag_issue(repo, issueid, username=None):
-    ''' Add a tag to an issue. '''
-    repo = progit.lib.get_project(SESSION, repo, user=username)
-
-    if repo is None:
-        flask.abort(404, 'Project not found')
-
-    if not repo.issue_tracker:
-        flask.abort(404, 'No issue tracker found for this project')
-
-    issue = progit.lib.search_issues(SESSION, repo, issueid=issueid)
-
-    if issue is None or issue.project != repo:
-        flask.abort(404, 'Issue not found')
-
-    form = progit.forms.AddIssueTagForm()
-    cat = None
-    if form.validate_on_submit():
-        tags = form.tag.data
-
-        for tag in tags.split(','):
-            tag = tag.strip()
-            try:
-                message = progit.lib.add_issue_tag(
+            if comment:
+                message = progit.lib.add_issue_comment(
                     SESSION,
                     issue=issue,
-                    tag=tag,
+                    comment=comment,
                     user=flask.g.fas_user.username,
                     ticketfolder=APP.config['TICKETS_FOLDER'],
                 )
                 SESSION.commit()
                 flask.flash(message)
-            except SQLAlchemyError, err:  # pragma: no cover
-                SESSION.rollback()
-                LOG.error(err)
-                flask.flash('Could not add tag: %s' % tag, 'error')
-
-    return flask.redirect(flask.url_for(
-        'view_issue', username=username, repo=repo.name, issueid=issueid))
-
-
-@APP.route('/<repo>/issue/<int:issueid>/assigned', methods=['POST'])
-@APP.route('/fork/<username>/<repo>/issue/<int:issueid>/assigned',
-           methods=['POST'])
-@cla_required
-def add_assignee_issue(repo, issueid, username=None):
-    ''' Add an assignee to an issue. '''
-    repo = progit.lib.get_project(SESSION, repo, user=username)
-
-    if repo is None:
-        flask.abort(404, 'Project not found')
-
-    if not repo.issue_tracker:
-        flask.abort(404, 'No issue tracker found for this project')
-
-    issue = progit.lib.search_issues(SESSION, repo, issueid=issueid)
-
-    if issue is None or issue.project != repo:
-        flask.abort(404, 'Issue not found')
-
-    form = progit.forms.ConfirmationForm()
-    cat = None
-    if form.validate_on_submit():
-        assignee = flask.request.form.get('assignee') or None
-
-        try:
-            message = progit.lib.add_issue_assignee(
-                SESSION,
-                issue=issue,
-                assignee=assignee,
-                user=flask.g.fas_user.username,
-                ticketfolder=APP.config['TICKETS_FOLDER'],)
-            if message:
-                SESSION.commit()
-                flask.flash(message)
-        except progit.exceptions.ProgitException, err:
-            flask.flash(str(err), 'error')
-        except SQLAlchemyError, err:  # pragma: no cover
-            SESSION.rollback()
-            LOG.error(err)
-            flask.flash('Could not assigned issue to: %s' % assignee, 'error')
 
-    return flask.redirect(flask.url_for(
-        'view_issue', username=username, repo=repo.name, issueid=issueid))
-
-
-@APP.route('/<repo>/issue/<int:issueid>/blocked/<issuetype>',
-           methods=['POST'])
-@APP.route('/fork/<username>/<repo>/issue/<int:issueid>/blocked<issuetype>/',
-           methods=['POST'])
-@cla_required
-def add_dependent_issue(repo, issueid, issuetype, username=None):
-    ''' Add a blocked issue to an issue. '''
-    repo = progit.lib.get_project(SESSION, repo, user=username)
-
-    if repo is None:
-        flask.abort(404, 'Project not found')
-
-    if not repo.issue_tracker:
-        flask.abort(404, 'No issue tracker found for this project')
-
-    issue = progit.lib.search_issues(SESSION, repo, issueid=issueid)
-
-    if issue is None or issue.project != repo:
-        flask.abort(404, 'Issue not found')
-
-    form = progit.forms.AddIssueDependencyForm()
-    cat = None
-    if form.validate_on_submit():
-        blocked = form.depends.data
-        issue_blocked = progit.lib.search_issues(
-            SESSION, repo, issueid=blocked)
-        if issue_blocked is None or issue_blocked.project != repo:
-            flask.abort(404, 'Issue blocked not found')
-
-        try:
-            if issuetype == 'parent':
-                message = progit.lib.add_issue_dependency(
+            if tags:
+                for tag in tags:
+                    message = progit.lib.add_issue_tag(
+                            SESSION,
+                            issue=issue,
+                            tag=tag,
+                            user=flask.g.fas_user.username,
+                            ticketfolder=APP.config['TICKETS_FOLDER'],
+                        )
+                    SESSION.commit()
+                    flask.flash(message)
+
+            if assignee:
+                message = progit.lib.add_issue_assignee(
                     SESSION,
                     issue=issue,
-                    issue_blocked=issue_blocked,
+                    assignee=assignee,
                     user=flask.g.fas_user.username,
                     ticketfolder=APP.config['TICKETS_FOLDER'],)
-            else:
-                message = progit.lib.add_issue_dependency(
+                if message:
+                    SESSION.commit()
+                    flask.flash(message)
+
+            if new_status == 'Fixed' and issue.parents:
+                for parent in issue.parents:
+                    print parent
+                    if parent.status == 'Open':
+                        flask.flash(
+                            'You cannot close a ticket that has ticket '
+                            'depending that are still open.',
+                            'error')
+                        return flask.redirect(flask.url_for(
+                            'view_issue', repo=repo.name, username=username,
+                            issueid=issueid))
+
+                message = progit.lib.edit_issue(
                     SESSION,
-                    issue=issue_blocked,
-                    issue_blocked=issue,
-                    user=flask.g.fas_user.username,
-                    ticketfolder=APP.config['TICKETS_FOLDER'],)
-            if message:
+                    issue=issue,
+                    status=new_status,
+                    ticketfolder=APP.config['TICKETS_FOLDER'],
+                )
                 SESSION.commit()
                 flask.flash(message)
-        except progit.exceptions.ProgitException, err:
-            flask.flash(str(err), 'error')
         except SQLAlchemyError, err:  # pragma: no cover
             SESSION.rollback()
-            LOG.error(err)
-            flask.flash(
-                'Could not blocked issue: %s with %s' % (blocked, issue.id),
-                'error')
+            APP.logger.exception(err)
+            flask.flash(str(err), 'error')
 
     return flask.redirect(flask.url_for(
         'view_issue', username=username, repo=repo.name, issueid=issueid))
 
 
+
 @APP.route('/<repo>/tag/<tag>/edit', methods=('GET', 'POST'))
 @APP.route('/fork/<username>/<repo>/tag/<tag>/edit', methods=('GET', 'POST'))
 @cla_required
@@ -426,44 +331,7 @@ def view_issue(repo, issueid, username=None):
 
     status = progit.lib.get_issue_statuses(SESSION)
 
-    form_comment = progit.forms.AddIssueCommentForm()
-    form = form_tag = None
-    if authenticated() and is_repo_admin(repo):
-        form = progit.forms.UpdateIssueStatusForm(status=status)
-        form_tag = progit.forms.AddIssueTagForm()
-
-        if form.validate_on_submit():
-            new_status = form.status.data
-            if new_status == 'Fixed' and issue.parents:
-                for parent in issue.parents:
-                    print parent
-                    if parent.status == 'Open':
-                        flask.flash(
-                            'You cannot close a ticket that has ticket '
-                            'depending that are still open.',
-                            'error')
-                        return flask.redirect(flask.url_for(
-                            'view_issue', repo=repo.name, username=username,
-                            issueid=issueid))
-
-            try:
-                message = progit.lib.edit_issue(
-                    SESSION,
-                    issue=issue,
-                    status=new_status,
-                    ticketfolder=APP.config['TICKETS_FOLDER'],
-                )
-                SESSION.commit()
-                flask.flash(message)
-                url = flask.url_for(
-                    'view_issue', username=username, repo=repo.name,
-                    issueid=issueid)
-                return flask.redirect(url)
-            except SQLAlchemyError, err:  # pragma: no cover
-                SESSION.rollback()
-                flask.flash(str(err), 'error')
-        elif flask.request.method == 'GET':
-            form.status.data = issue.status
+    form = progit.forms.UpdateIssueForm(status=status)
 
     return flask.render_template(
         'issue.html',
@@ -473,8 +341,7 @@ def view_issue(repo, issueid, username=None):
         issue=issue,
         issueid=issueid,
         form=form,
-        form_comment=form_comment,
-        form_tag=form_tag,
+        repo_admin = is_repo_admin(repo),
     )