diff --git a/.travis.yml b/.travis.yml
index ef0c8be76..2688424aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ install:
   - pip install -U pip wheel
   - pip install -r requirements.txt
   - pip install -r test_requirements.txt
+  - make
 script:
   - ./runtests.sh
 after_success:
diff --git a/funnel/__init__.py b/funnel/__init__.py
index 1cff04e73..2fc7e600d 100644
--- a/funnel/__init__.py
+++ b/funnel/__init__.py
@@ -100,6 +100,16 @@
 app.assets.register('css_leaflet',
     Bundle(assets.require('leaflet.css', 'leaflet-search.css'),
         output='css/leaflet.packed.css', filters='cssmin'))
+app.assets.register('js_emojionearea',
+    Bundle(assets.require('!jquery.js', 'emojionearea-material.js'),
+        output='js/emojionearea.packed.js', filters='uglipyjs'))
+app.assets.register('css_emojionearea',
+    Bundle(assets.require('emojionearea-material.css'),
+        output='css/emojionearea.packed.css', filters='cssmin'))
+app.assets.register('js_sortable',
+    Bundle(assets.require('!jquery.js', 'jquery.ui.js', 'jquery.ui.sortable.touch.js'),
+        output='js/sortable.packed.js', filters='uglipyjs'))
+
 
 baseframe.init_app(funnelapp, requires=['funnel'], ext_requires=[
     'pygments', 'toastr', 'baseframe-mui'], theme='mui')
@@ -133,6 +143,15 @@
 funnelapp.assets.register('css_leaflet',
     Bundle(assets.require('leaflet.css', 'leaflet-search.css'),
         output='css/leaflet.packed.css', filters='cssmin'))
+funnelapp.assets.register('js_emojionearea',
+    Bundle(assets.require('!jquery.js', 'emojionearea-material.js'),
+        output='js/emojionearea.packed.js', filters='uglipyjs'))
+funnelapp.assets.register('css_emojionearea',
+    Bundle(assets.require('emojionearea-material.css'),
+        output='css/emojionearea.packed.css', filters='cssmin'))
+funnelapp.assets.register('js_sortable',
+    Bundle(assets.require('!jquery.js', 'jquery.ui.js', 'jquery.ui.sortable.touch.js'),
+        output='js/sortable.packed.js', filters='uglipyjs'))
 
 # FIXME: Hack for external build system generating relative /static URLs.
 # Fix this by generating absolute URLs to the static subdomain during build.
diff --git a/funnel/assets/js/proposal.js b/funnel/assets/js/proposal.js
index 819735053..29a0d64aa 100644
--- a/funnel/assets/js/proposal.js
+++ b/funnel/assets/js/proposal.js
@@ -101,9 +101,72 @@ export const Video = {
   },
 };
 
+export const LabelsWidget = {
+  init() {
+    const Widget = this;
+    // On load, if the radio has been selected, then check mark the listwidget label
+    $('.listwidget input[type="radio"]').each(function() {
+      if(this.checked) {
+        $(this).siblings().find('.mui-form__label').addClass('checked');
+      }
+    });
+
+    $('.listwidget .mui-form__label').click(function() {
+      if($(this).hasClass('checked')) {
+        $(this).removeClass('checked');
+        $(this).siblings().find('input[type="radio"]').prop('checked', false);
+        Widget.updateLabels('', $(this).text().trim(), false);
+      } else {
+        $(this).addClass('checked');
+        $(this).siblings().find('input[type="radio"]').first().click();
+      }
+    });
+
+        // Add check mark to listwidget label
+    $('.listwidget input[type="radio"]').change(function() {
+      let label = $(this).parent().parent().prev('.mui-form__label');
+      label.addClass('checked');
+      let labelTxt = `${label.text()}: ${$(this).parent().find('label').text()}`.trim();
+      let attr = label.text().trim();
+      Widget.updateLabels(labelTxt, attr, this.checked);
+    });
+
+    $('.add-label-form input[type="checkbox"]').change(function() {
+      let labelTxt = $(this).parent('label').text().trim();
+      Widget.updateLabels(labelTxt, labelTxt, this.checked);
+    });
+
+    // Open and close dropdown
+    $(document).on('click', function(event) {
+      if ($('#label-select')[0] === event.target || !$(event.target).parents('#label-dropdown').length) {
+        Widget.handleDropdown();
+      }
+    });
+  },
+  handleDropdown() {
+    if($('#label-dropdown fieldset').hasClass('active')) {
+      $('#label-dropdown fieldset').removeClass('active');
+    } else {
+      $('#label-dropdown fieldset').addClass('active');
+    }
+  },
+  updateLabels(label='', attr='', action=true) {
+    if(action) {
+      if(label !== attr) {
+        $(`.label[data-labeltxt="${attr}"]`).remove();
+      }
+      let span = `<span class="label mui--text-caption mui--text-bold" data-labeltxt="${attr}">${label}</span>`;
+      $('#label-select').append(span);
+    } else {
+      $(`.label[data-labeltxt="${attr}"]`).remove();
+    }
+  }
+};
+
 $(() => {
   window. HasGeek.ProposalInit = function ({pageUrl, videoWrapper= '', videoUrl= ''}) {
     Comments.init(pageUrl);
+    LabelsWidget.init();
 
     if (videoWrapper) {
       Video.embedIframe(videoWrapper, videoUrl);
diff --git a/funnel/forms/__init__.py b/funnel/forms/__init__.py
index 0070d0301..36a0e5144 100644
--- a/funnel/forms/__init__.py
+++ b/funnel/forms/__init__.py
@@ -9,3 +9,4 @@
 from .session import *
 from .profile import *
 from .participant import *
+from .label import *
diff --git a/funnel/forms/label.py b/funnel/forms/label.py
new file mode 100644
index 000000000..80623bbe1
--- /dev/null
+++ b/funnel/forms/label.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+
+from baseframe import __
+import baseframe.forms as forms
+
+__all__ = ['LabelForm', 'LabelOptionForm']
+
+
+class LabelForm(forms.Form):
+    name = forms.StringField("", widget=forms.HiddenInput(), validators=[forms.validators.Optional()])
+    title = forms.StringField(__("Label"),
+        validators=[forms.validators.DataRequired(__(u"This can’t be empty")), forms.validators.Length(max=250)])
+    icon_emoji = forms.StringField("")
+    required = forms.BooleanField(__("Make this label mandatory in proposal forms"), default=False,
+        description=__("If checked, proposers must select one of the options"))
+    restricted = forms.BooleanField(__("Restrict use of this label to editors"), default=False,
+        description=__("If checked, only editors and reviewers can apply this label on proposals"))
+
+
+class LabelOptionForm(forms.Form):
+    name = forms.StringField("", widget=forms.HiddenInput(), validators=[forms.validators.Optional()])
+    title = forms.StringField(__("Option"),
+        validators=[forms.validators.DataRequired(__(u"This can’t be empty")), forms.validators.Length(max=250)])
+    icon_emoji = forms.StringField("")
+    seq = forms.IntegerField("", widget=forms.HiddenInput())
diff --git a/funnel/forms/proposal.py b/funnel/forms/proposal.py
index 8cf784292..4b4424813 100644
--- a/funnel/forms/proposal.py
+++ b/funnel/forms/proposal.py
@@ -6,36 +6,81 @@
 from baseframe.forms.sqlalchemy import QuerySelectField
 from ..models import Project, Profile
 
-__all__ = ['TransferProposal', 'ProposalForm', 'ProposalTransitionForm', 'ProposalMoveForm']
+__all__ = ['TransferProposal', 'ProposalForm', 'ProposalTransitionForm', 'ProposalLabelsForm',
+    'ProposalMoveForm', 'ProposalLabelsAdminForm']
+
+
+def proposal_label_form(project, proposal):
+    """
+    Returns a label form for the given project and proposal.
+    """
+    class ProposalLabelForm(forms.Form):
+        pass
+
+    for label in project.labels:
+        if label.has_options and not label.archived and not label.restricted:
+            setattr(ProposalLabelForm, label.name, forms.RadioField(
+                label.form_label_text,
+                description=label.description,
+                validators=[forms.validators.DataRequired(__("Please select one"))] if label.required else [],
+                choices=[(option.name, option.title) for option in label.options if not option.archived]
+            ))
+
+    return ProposalLabelForm(obj=proposal.formlabels if proposal else None, meta={'csrf': False})
+
+
+def proposal_label_admin_form(project, proposal):
+    """
+    Returns a label form to use in admin panel for given project and proposal
+    """
+    class ProposalLabelAdminForm(forms.Form):
+        pass
+
+    for label in project.labels:
+        if not label.archived and (label.restricted or not label.has_options):
+            form_kwargs = {}
+            if label.has_options:
+                FieldType = forms.RadioField
+                form_kwargs['choices'] = [(option.name, option.title) for option in label.options if not option.archived]
+            else:
+                FieldType = forms.BooleanField
+
+            setattr(ProposalLabelAdminForm, label.name, FieldType(
+                label.form_label_text,
+                description=label.description,
+                validators=[forms.validators.DataRequired(__("Please select one"))] if label.required else [],
+                **form_kwargs
+            ))
+
+    return ProposalLabelAdminForm(obj=proposal.formlabels if proposal else None, meta={'csrf': False})
 
 
 class TransferProposal(forms.Form):
     userid = forms.UserSelectField(__("Transfer to"), validators=[forms.validators.DataRequired()])
 
 
+class ProposalLabelsForm(forms.Form):
+    formlabels = forms.FormField(forms.Form, __("Labels"))
+
+    def set_queries(self):
+        self.formlabels.form = proposal_label_form(project=self.edit_parent, proposal=self.edit_obj)
+
+
+class ProposalLabelsAdminForm(forms.Form):
+    formlabels = forms.FormField(forms.Form, __("Labels"))
+
+    def set_queries(self):
+        self.formlabels.form = proposal_label_admin_form(project=self.edit_parent, proposal=self.edit_obj)
+
+
 class ProposalForm(forms.Form):
     speaking = forms.RadioField(__("Are you speaking?"), coerce=int,
         choices=[(1, __(u"I will be speaking")),
                  (0, __(u"I’m proposing a topic for someone to speak on"))])
     title = forms.StringField(__("Title"), validators=[forms.validators.DataRequired()],
         description=__("The title of your session"))
-    section = QuerySelectField(__("Section"), get_label='title', validators=[forms.validators.DataRequired()],
-        widget=forms.ListWidget(prefix_label=False), option_widget=forms.RadioInput())
     objective = forms.MarkdownField(__("Objective"), validators=[forms.validators.DataRequired()],
         description=__("What is the expected benefit for someone attending this?"))
-    session_type = forms.RadioField(__("Session type"), validators=[forms.validators.DataRequired()], choices=[
-        ('Lecture', __("Lecture")),
-        ('Demo', __("Demo")),
-        ('Tutorial', __("Tutorial")),
-        ('Workshop', __("Workshop")),
-        ('Discussion', __("Discussion")),
-        ('Panel', __("Panel")),
-    ])
-    technical_level = forms.RadioField(__("Technical level"), validators=[forms.validators.DataRequired()], choices=[
-        ('Beginner', __("Beginner")),
-        ('Intermediate', __("Intermediate")),
-        ('Advanced', __("Advanced")),
-    ])
     description = forms.MarkdownField(__("Description"), validators=[forms.validators.DataRequired()],
         description=__("A detailed description of the session"))
     requirements = forms.MarkdownField(__("Requirements"),
@@ -63,6 +108,8 @@ class ProposalForm(forms.Form):
     location = forms.StringField(__("Your location"), validators=[forms.validators.DataRequired(), forms.validators.Length(max=80)],
         description=__("Your location, to help plan for your travel if required"))
 
+    formlabels = forms.FormField(forms.Form, __("Labels"))
+
     def __init__(self, *args, **kwargs):
         super(ProposalForm, self).__init__(*args, **kwargs)
         project = kwargs.get('parent')
@@ -75,6 +122,9 @@ def __init__(self, *args, **kwargs):
         if project.proposal_part_b.get('hint'):
             self.description.description = project.proposal_part_b.get('hint')
 
+    def set_queries(self):
+        self.formlabels.form = proposal_label_form(project=self.edit_parent, proposal=self.edit_obj)
+
 
 class ProposalTransitionForm(forms.Form):
     transition = forms.SelectField(__("Status"), validators=[forms.validators.DataRequired()])
diff --git a/funnel/models/__init__.py b/funnel/models/__init__.py
index f05ffa91a..1c1a3bd65 100644
--- a/funnel/models/__init__.py
+++ b/funnel/models/__init__.py
@@ -19,3 +19,4 @@
 from .session import *
 from .user import *
 from .venue import *
+from .label import *
diff --git a/funnel/models/label.py b/funnel/models/label.py
index 98a0ea266..46a6af017 100644
--- a/funnel/models/label.py
+++ b/funnel/models/label.py
@@ -1,67 +1,277 @@
 # -*- coding: utf-8 -*-
 
-from . import db, make_timestamp_columns, TimestampMixin, BaseScopedNameMixin
-from .profile import Profile
+from sqlalchemy.sql import case, exists
+from sqlalchemy.ext.orderinglist import ordering_list
+from sqlalchemy.ext.hybrid import hybrid_property
+
+from . import db, BaseScopedNameMixin
 from .project import Project
 from .proposal import Proposal
 
 
-class Labelset(BaseScopedNameMixin, db.Model):
-    """
-    A collection of labels, in checkbox mode (select multiple) or radio mode (select one). A profile can
-    contain multiple label sets and a Project can enable one or more sets to be used in Proposals.
-    """
-    __tablename__ = 'labelset'
+proposal_label = db.Table(
+    'proposal_label', db.Model.metadata,
+    db.Column('proposal_id', None, db.ForeignKey('proposal.id', ondelete='CASCADE'), nullable=False, primary_key=True),
+    db.Column('label_id', None, db.ForeignKey('label.id', ondelete='CASCADE'), nullable=False, primary_key=True, index=True),
+    db.Column('created_at', db.DateTime, default=db.func.utcnow())
+)
 
-    profile_id = db.Column(None, db.ForeignKey('profile.id'), nullable=False)
-    profile = db.relationship(Profile, backref=db.backref('labelsets', cascade='all, delete-orphan'))
-    parent = db.synonym('profile')
 
-    radio_mode = db.Column(db.Boolean, nullable=False, default=False)
+class Label(BaseScopedNameMixin, db.Model):
+    __tablename__ = 'label'
 
-    __table_args__ = (db.UniqueConstraint('profile_id', 'name'),)
+    project_id = db.Column(None, db.ForeignKey('project.id', ondelete='CASCADE'), nullable=False)
+    project = db.relationship(Project)  # Backref is defined in the Project model with an ordering list
+    # `parent` is required for :meth:`~coaster.sqlalchemy.mixins.BaseScopedNameMixin.make_name()`
+    parent = db.synonym('project')
 
-    def __repr__(self):
-        return "<Labelset %s in %s>" % (self.name, self.profile.name)
+    #: Parent label's id. Do not write to this column directly, as we don't have the ability to
+    #: validate the value within the app. Always use the :attr:`main_label` relationship.
+    main_label_id = db.Column(
+        'main_label_id',
+        None,
+        db.ForeignKey('label.id', ondelete='CASCADE'),
+        index=True,
+        nullable=True
+    )
+    # See https://docs.sqlalchemy.org/en/13/orm/self_referential.html
+    options = db.relationship(
+        'Label',
+        backref=db.backref('main_label', remote_side='Label.id'),
+        order_by='Label.seq',
+        collection_class=ordering_list('seq', count_from=1)
+    )
 
+    # TODO: Add sqlalchemy validator for `main_label` to ensure the parent's project matches.
+    # Ideally add a SQL post-update trigger as well (code is in coaster's add_primary_relationship)
 
-proposal_label = db.Table(
-    'proposal_label', db.Model.metadata,
-    *(make_timestamp_columns() + (
-        db.Column('proposal_id', None, db.ForeignKey('proposal.id'), nullable=False, primary_key=True),
-        db.Column('label_id', None, db.ForeignKey('label.id'), nullable=False, primary_key=True)
-    )))
+    #: Sequence number for this label, used in UI for ordering
+    seq = db.Column(db.Integer, nullable=False)
 
+    # A single-line description of this label, shown when picking labels (optional)
+    description = db.Column(db.UnicodeText, nullable=False, default=u"")
 
-class Label(BaseScopedNameMixin, db.Model):
-    __tablename__ = 'label'
+    #: Icon for displaying in space-constrained UI. Contains one emoji symbol.
+    #: Since emoji can be composed from multiple symbols, there is no length
+    #: limit imposed here
+    icon_emoji = db.Column(db.UnicodeText, nullable=True)
 
-    labelset_id = db.Column(None, db.ForeignKey('labelset.id'), nullable=False)
-    labelset = db.relationship(Labelset)
+    #: Restricted mode specifies that this label may only be applied by someone with
+    #: an editorial role (TODO: name the role). If this label is a parent, it applies
+    #: to all its children
+    _restricted = db.Column('restricted', db.Boolean, nullable=False, default=False)
 
+    #: Required mode signals to UI that if this label is a parent, one of its
+    #: children must be mandatorily applied to the proposal. The value of this
+    #: field must be ignored if the label is not a parent
+    _required = db.Column('required', db.Boolean, nullable=False, default=False)
+
+    #: Archived mode specifies that the label is no longer available for use
+    #: although all the previous records will stay in database.
+    _archived = db.Column('archived', db.Boolean, nullable=False, default=False)
+
+    #: Proposals that this label is attached to
     proposals = db.relationship(Proposal, secondary=proposal_label, backref='labels')
 
-    __table_args__ = (db.UniqueConstraint('labelset_id', 'name'),)
+    __table_args__ = (db.UniqueConstraint('project_id', 'name'),)
+
+    __roles__ = {
+        'all': {
+            'read': {
+                'name', 'title', 'project_id', 'project', 'seq',
+                'restricted', 'required', 'archived'
+            }
+        }
+    }
+
+    @property
+    def title_for_name(self):
+        if self.main_label:
+            return u"%s/%s" % (self.main_label.title, self.title)
+        else:
+            return self.title
+
+    @property
+    def form_label_text(self):
+        return self.icon_emoji + " " + self.title if self.icon_emoji is not None else self.title
+
+    @property
+    def has_proposals(self):
+        if not self.has_options:
+            return bool(self.proposals)
+        else:
+            return any(bool(option.proposals) for option in self.options)
+
+    @hybrid_property
+    def restricted(self):
+        return self.main_label._restricted if self.main_label else self._restricted
+
+    @restricted.setter
+    def restricted(self, value):
+        if self.main_label:
+            raise ValueError("This flag must be set on the parent")
+        self._restricted = value
+
+    @restricted.expression
+    def restricted(cls):
+        return case([
+            (cls.main_label_id != None, db.select([Label._restricted]).where(Label.id == cls.main_label_id).as_scalar())  # NOQA
+        ], else_=cls._restricted)
+
+    @hybrid_property
+    def archived(self):
+        return self._archived or (self.main_label._archived if self.main_label else False)
+
+    @archived.setter
+    def archived(self, value):
+        self._archived = value
+
+    @archived.expression
+    def archived(cls):
+        return case([
+            (cls._archived == True, cls._archived),  # NOQA
+            (cls.main_label_id != None, db.select([Label._archived]).where(Label.id == cls.main_label_id).as_scalar())  # NOQA
+        ], else_=cls._archived)
+
+    @hybrid_property
+    def has_options(self):
+        return bool(self.options)
+
+    @has_options.expression
+    def has_options(cls):
+        return exists().where(Label.main_label_id == cls.id)
+
+    @property
+    def is_main_label(self):
+        return not self.main_label
+
+    @hybrid_property
+    def required(self):
+        return self._required if self.has_options else False
+
+    @required.setter
+    def required(self, value):
+        if value and not self.has_options:
+            raise ValueError("Labels without options cannot be mandatory")
+        self._required = value
+
+    @property
+    def icon(self):
+        """
+        Returns an icon for displaying the label in space-constrained UI.
+        If an emoji icon has been specified, use it. If not, create initials
+        from the title (up to 3). If the label is a single word, returns the
+        first three characters.
+        """
+        result = self.icon_emoji
+        if not result:
+            result = ''.join(w[0] for w in self.title.strip().title().split(None, 2))
+            if len(result) <= 1:
+                result = self.title.strip()[:3]
+        return result
 
     def __repr__(self):
-        return "<Label %s/%s>" % (self.labelset.name, self.name)
+        if self.main_label:
+            return "<Label %s/%s>" % (self.main_label.name, self.name)
+        else:
+            return "<Label %s>" % self.name
+
+    def roles_for(self, actor=None, anchors=()):
+        roles = super(Label, self).roles_for(actor, anchors)
+        roles.update(self.project.roles_for(actor, anchors))
+        return roles
+
+    def apply_to(self, proposal):
+        if self.has_options:
+            raise ValueError("This label requires one of its options to be used")
+        if self in proposal.labels:
+            return
+
+        if self.main_label is not None:
+            existing_labels = set(self.main_label.options).intersection(set(proposal.labels))
+            if existing_labels:
+                # the parent label is in radio mode and one of it's labels are
+                # already assigned to this proposal. We need to
+                # remove the older label and assign given label.
+                for elabel in existing_labels:
+                    proposal.labels.remove(elabel)
+        # we can assign label to proposal
+        proposal.labels.append(self)
+
+    def remove_from(self, proposal):
+        if self.has_options:
+            raise ValueError("This label requires one of its options to be removed")
+        if self in proposal.labels:
+            proposal.labels.remove(self)
+
+
+class ProposalLabelProxyWrapper(object):
+    def __init__(self, obj):
+        object.__setattr__(self, '_obj', obj)
+
+    def __getattr__(self, name):
+        # What this does:
+        # 1. Check if the project has this label (including archived labels). If not, raise error
+        # 2. If this is not a parent label:
+        # 2a. Check if proposal has this label set. If so, return True, else False
+        # 3. If this is a parent label:
+        # 3a. If the proposal has one of the options set, return its name. If not, return None
+
+        label = Label.query.filter(
+            Label.name == name, Label.project == self._obj.project
+        ).one_or_none()
+        if not label:
+            raise AttributeError
+
+        if not label.has_options:
+            return label in self._obj.labels
+
+        # Only one option from a main label should be set at a time, but we enforce
+        # this in the UI, not in the db, so more than one may exist in the db.
+        label_options = list(set(self._obj.labels).intersection(set(label.options)))
+        return label_options[0].name if len(label_options) > 0 else None
+
+    def __setattr__(self, name, value):
+        label = Label.query.filter(
+            Label.name == name, Label.project == self._obj.project, Label._archived == False
+        ).one_or_none()  # NOQA
+        if not label:
+            raise AttributeError
+
+        if not label.has_options:
+            if value is True:
+                if label not in self._obj.labels:
+                    self._obj.labels.append(label)
+            elif value is False:
+                if label in self._obj.labels:
+                    self._obj.labels.remove(label)
+            else:
+                raise ValueError("This label can only be set to True or False")
+        else:
+            option_label = Label.query.filter_by(
+                main_label=label,
+                _archived=False,
+                name=value).one_or_none()
+            if not option_label:
+                raise ValueError("Invalid option for this label")
 
+            # Scan for conflicting labels and remove them. Iterate over a copy
+            # to allow mutation of the source list during iteration
+            for existing_label in list(self._obj.labels):
+                if existing_label != option_label and existing_label.main_label == option_label.main_label:
+                    self._obj.labels.remove(existing_label)
 
-class ProjectLabelset(TimestampMixin, db.Model):
-    __tablename__ = 'project_labelset'
+            if option_label not in self._obj.labels:
+                self._obj.labels.append(option_label)
 
-    project_id = db.Column(None, db.ForeignKey('project.id'), nullable=False, primary_key=True)
-    project = db.relationship(Project, backref=db.backref('labelset_links', cascade='all, delete-orphan'))
-    labelset_id = db.Column(None, db.ForeignKey('labelset.id'), nullable=False, primary_key=True)
-    labelset = db.relationship(Labelset, backref=db.backref('project_links', cascade='all, delete-orphan'))
-    seq = db.Column(db.Integer, nullable=False, default=0)
 
+class ProposalLabelProxy(object):
+    def __get__(self, obj, cls=None):
+        if obj is not None:
+            return ProposalLabelProxyWrapper(obj)
+        else:
+            return self
 
-# TODO: Should this be just a secondary table?
-# class ProposalLabel(TimestampMixin, db.Model):
-#     __tablename__ = 'proposal_label'
 
-#     proposal_id = db.Column(None, db.ForeignKey('proposal.id'), nullable=False, primary_key=True)
-#     proposal = db.relationship(Proposal, backref=db.backref('label_links', cascade='all, delete-orphan'))
-#     label_id = db.Column(None, db.ForeignKey('label.id'), nullable=False, primary_key=True)
-#     label = db.relationship(Label, backref=db.backref('proposal_links', cascade='all, delete-orphan'))
+#: For reading and setting labels from the edit form
+Proposal.formlabels = ProposalLabelProxy()
diff --git a/funnel/models/project.py b/funnel/models/project.py
index a868b1a0e..5866e4d20 100644
--- a/funnel/models/project.py
+++ b/funnel/models/project.py
@@ -128,10 +128,14 @@ class Project(UuidMixin, BaseScopedNameMixin, db.Model):
     parent_id = db.Column(None, db.ForeignKey('project.id', ondelete='SET NULL'), nullable=True)
     parent_project = db.relationship('Project', remote_side='Project.id', backref='subprojects')
     inherit_sections = db.Column(db.Boolean, default=True, nullable=False)
-    labels = db.Column(JsonDict, nullable=False, server_default='{}')
+    part_labels = db.Column('labels', JsonDict, nullable=False, server_default='{}')
 
     venues = db.relationship('Venue', cascade='all, delete-orphan',
-            order_by='Venue.seq', collection_class=ordering_list('seq', count_from=1))
+        order_by='Venue.seq', collection_class=ordering_list('seq', count_from=1))
+    labels = db.relationship('Label', cascade='all, delete-orphan',
+        primaryjoin='and_(Label.project_id == Project.id, Label.main_label_id == None, Label._archived == False)',
+        order_by='Label.seq', collection_class=ordering_list('seq', count_from=1))
+    all_labels = db.relationship('Label', lazy='dynamic')
 
     featured_sessions = db.relationship(
         'Session',
@@ -155,7 +159,7 @@ class Project(UuidMixin, BaseScopedNameMixin, db.Model):
                 '_state', 'website', 'bg_image', 'bg_color', 'explore_url', 'tagline', 'absolute_url',
                 'location'
             },
-        },
+        }
     }
 
     @cached_property
@@ -355,11 +359,11 @@ def location_geonameid(self):
 
     @property
     def proposal_part_a(self):
-        return self.labels.get('proposal', {}).get('part_a', {})
+        return self.part_labels.get('proposal', {}).get('part_a', {})
 
     @property
     def proposal_part_b(self):
-        return self.labels.get('proposal', {}).get('part_b', {})
+        return self.part_labels.get('proposal', {}).get('part_b', {})
 
     def set_labels(self, value=None):
         """
@@ -370,9 +374,9 @@ def set_labels(self, value=None):
         are allowed to be customized per project.
         """
         if value and isinstance(value, dict):
-            self.labels = value
+            self.part_labels = value
         else:
-            self.labels = {
+            self.part_labels = {
                 "proposal": {
                     "part_a": {
                         "title": "Abstract",
@@ -425,7 +429,7 @@ def permissions(self, user, inherited=None):
                     'view-ticket-type',
                     'edit-participant',
                     'view-participant',
-                    'new-participant'
+                    'new-participant',
                 ])
             if self.review_team and user in self.review_team.users:
                 perms.update([
@@ -433,7 +437,7 @@ def permissions(self, user, inherited=None):
                     'confirm-proposal',
                     'view_voteinfo',
                     'view_status',
-                    'edit-proposal',
+                    'edit_proposal',
                     'delete-proposal',
                     'edit-schedule',
                     'new-session',
diff --git a/funnel/models/proposal.py b/funnel/models/proposal.py
index af97bb251..dfcdfc621 100644
--- a/funnel/models/proposal.py
+++ b/funnel/models/proposal.py
@@ -50,42 +50,6 @@ class PROPOSAL_STATE(LabeledEnum):
 
 # --- Models ------------------------------------------------------------------
 
-class ProposalFormData(object):
-    """
-    Form data access helper for custom fields
-    """
-    def __init__(self, proposal):
-        self.__dict__['proposal'] = proposal
-        self.__dict__['data'] = proposal.data
-
-    def __getattr__(self, attr, default=_marker):
-        if attr in self.proposal.__invalid_fields__ or attr.startswith('_'):
-            raise AttributeError("Invalid attribute: %s" % attr)
-
-        if default is _marker:
-            try:
-                if hasattr(self.proposal, attr):
-                    return getattr(self.proposal, attr)
-                return self.data[attr]
-            except KeyError:
-                raise AttributeError(attr)
-        else:
-            if hasattr(self.proposal, attr):
-                return getattr(self.proposal, attr, default)
-            return self.data.get(attr, default)
-
-    def __setattr__(self, attr, value):
-        if attr in self.proposal.__invalid_fields__ or attr.startswith('_'):
-            raise AttributeError("Invalid attribute: %s" % attr)
-
-        if hasattr(self.proposal, attr):
-            if attr in self.proposal.__valid_fields__:
-                setattr(self.proposal, attr, value)
-            else:
-                raise AttributeError("Cannot set attribute: %s" % attr)
-        else:
-            self.data[attr] = value
-
 
 class Proposal(UuidMixin, BaseScopedIdNameMixin, CoordinatesMixin, db.Model):
     __tablename__ = 'proposal'
@@ -140,16 +104,6 @@ class Proposal(UuidMixin, BaseScopedIdNameMixin, CoordinatesMixin, db.Model):
 
     __table_args__ = (db.UniqueConstraint('project_id', 'url_id'),)
 
-    # XXX: The following two may overlap. Reconsider whether both are needed
-
-    # Allow these fields to be set on the proposal by custom forms
-    __valid_fields__ = ('title', 'speaker', 'speaking', 'email', 'phone', 'bio', 'section', 'objective', 'session_type',
-        'technical_level', 'description', 'requirements', 'slides', 'preview_video', 'links', 'location',
-        'latitude', 'longitude', 'coordinates')
-    # Never allow these fields to be set on the proposal or proposal.data by custom forms
-    __invalid_fields__ = ('id', 'name', 'url_id', 'user_id', 'user', 'speaker_id', 'project_id',
-        'project', 'parent', 'voteset_id', 'voteset', 'commentset_id', 'commentset', 'edited_at', 'data')
-
     __roles__ = {
         'all': {
             'read': {
@@ -275,10 +229,6 @@ def move_to(self, project):
         self.url_id = None
         self.make_id()
 
-    @property
-    def formdata(self):
-        return ProposalFormData(self)
-
     @property
     def owner(self):
         return self.speaker or self.user
@@ -332,7 +282,7 @@ def permissions(self, user, inherited=None):
             if user == self.owner:
                 perms.update([
                     'view-proposal',
-                    'edit-proposal',
+                    'edit_proposal',
                     'delete-proposal',  # FIXME: Prevent deletion of confirmed proposals
                     'submit-proposal',  # For workflows, to confirm the form is ready for submission (from draft state)
                     'transfer-proposal',
@@ -341,8 +291,6 @@ def permissions(self, user, inherited=None):
                     perms.add('decline-proposal')  # Decline speaking
         return perms
 
-    # Roles
-
     def roles_for(self, actor=None, anchors=()):
         roles = super(Proposal, self).roles_for(actor, anchors)
         if self.speaker and self.speaker == actor:
diff --git a/funnel/static/css/app.css b/funnel/static/css/app.css
index 5b0992842..7448b326c 100644
--- a/funnel/static/css/app.css
+++ b/funnel/static/css/app.css
@@ -151,6 +151,7 @@ html.touch .collapsible__body--disable {
     position: -webkit-sticky;
     top: 70px;
     order: 1;
+    z-index: 5;
   }
 }
 @media screen and (max-width: 1024px) {
@@ -183,28 +184,6 @@ html.touch .collapsible__body--disable {
   margin-bottom: 10px;
 }
 
-.cfp-action-btn {
-  padding: 10px 0;
-  cursor: pointer;
-  margin-right: 10px;
-  border: none;
-  color: #4A90E2;
-  background: none;
-}
-
-.cfp-action-btn:focus,
-.cfp-action-btn:hover {
-  border: none;
-  outline: none;
-  box-shadow: none;
-  color: #4A90E2;
-}
-
-.inline-form {
-  display: inline-block;
-  vertical-align: middle;
-}
-
 .past-events-table {
   border-collapse: collapse;
 }
@@ -231,6 +210,15 @@ html.touch .collapsible__body--disable {
   margin-top: -30px;
 }
 
+.mui-btn--nopadding {
+  padding-left: 0;
+  padding-right: 0;
+}
+
+.mui-btn--nopadding:hover {
+  background: transparent !important;
+}
+
 .header__site-title__item {
   font-size: 18px;
   line-height: 28px;
@@ -402,6 +390,155 @@ html.touch .collapsible__body--disable {
   text-transform: uppercase;
 }
 
+.cfp-action-btn {
+  padding: 10px 0;
+  cursor: pointer;
+  margin-right: 10px;
+  border: none;
+  color: #4A90E2;
+  background: none;
+}
+
+.cfp-action-btn:focus,
+.cfp-action-btn:hover {
+  border: none;
+  outline: none;
+  box-shadow: none;
+  color: #4A90E2;
+}
+
+.inline-form {
+  display: inline-block;
+  vertical-align: middle;
+}
+
+.label-form {
+  max-width: 500px;
+}
+.label-form .label-form__title-field {
+  width: calc(100% - 130px);
+  display: inline-block;
+}
+.label-form .label-form__title-field--close {
+  width: calc(100% - 114px);
+}
+.label-form .label-form__subform__close-btn {
+  position: absolute;
+  top: 0;
+  z-index: 100;
+  right: 5px;
+  background: #fff;
+}
+.label-form .label-form__subform {
+  margin-left: 20px;
+}
+.label-form .emojipicker {
+  float: left;
+  width: 70px;
+  height: 48px;
+  margin-right: 20px;
+}
+.label-form .emojipicker label {
+  display: none;
+}
+.label-form .emojipicker .emojionearea-editor {
+  height: 48px;
+  min-height: 20px;
+  overflow: hidden;
+  white-space: nowrap;
+  position: absolute;
+  top: 0;
+  left: 12px;
+  right: 24px;
+  padding: 6px 0;
+}
+.label-form .emojipicker .emojionearea-button {
+  top: 10px;
+}
+.label-form .emojipicker .emojionearea-editor {
+  left: 6px !important;
+  padding-right: 45px !important;
+}
+.label-form .emojipicker .emojionearea-button .emojionearea-button-open,
+.label-form .emojipicker .emojionearea-button .emojionearea-button-close {
+  right: 3px;
+}
+.label-form .emojipicker .emojionearea .emojionearea-editor [class*=emojione-], .label-form .emojipicker .emojionearea .emojionearea-editor .emojioneemoji {
+  margin: -.2ex 1ex .2ex -0.5ex;
+}
+
+.ui-dragable-box {
+  padding: 25px 10px 10px 20px;
+  border-radius: 3px;
+  border: 1px solid #ddd;
+  background: #FFF;
+  cursor: pointer;
+  position: relative;
+  margin: 10px 15px;
+}
+.ui-dragable-box .drag-icon {
+  position: absolute;
+  left: 5px;
+  top: 0;
+}
+
+.ui-dragable-box__header {
+  padding: 0;
+  margin: 10px 0;
+}
+
+.ui-dragable-box--header .collapsible__header {
+  margin: 0;
+}
+
+.ui-dragable-box label {
+  cursor: pointer;
+}
+
+.ui-dragable-box:hover {
+  cursor: pointer;
+  box-shadow: 0 1px 3px rgba(158, 158, 158, 0.12), 0 1px 2px rgba(158, 158, 158, 0.24);
+}
+
+.ui-box-placeholder, .ui-box-placeholder--bigger {
+  margin: 10px 15px;
+  padding: 10px;
+  border-radius: 3px;
+  border: 1px solid #ddd;
+  background: #FFF;
+  height: 55px;
+}
+
+.ui-box-placeholder--bigger {
+  margin: 10px 0;
+  height: 80px;
+}
+
+.seq-input {
+  position: absolute;
+  right: 0px;
+  width: 20px;
+  border: 0;
+  top: 5px;
+  font-size: 14px;
+  line-height: 1;
+  color: #8492A6;
+}
+
+.seq-input--bg {
+  background: #EFF2F7;
+}
+
+.seq-input:focus,
+.seq-input:active {
+  outline: none;
+}
+
+.ui-dragable-box .sp-replacer {
+  margin-top: 5px;
+  margin-left: 5px;
+}
+
 .clickable-card {
   color: #1F2D3D;
   display: block;
@@ -493,6 +630,25 @@ html.touch .collapsible__body--disable {
   transform: translate(-50%, -50%);
 }
 
+.card__body--minheight {
+  min-height: 150px;
+}
+
+.card__body--new {
+  min-height: 194px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.card__body--new .new-btn:hover {
+  text-decoration: none;
+}
+
+.card--small {
+  max-width: 400px;
+  margin-top: 10px;
+}
+
 .profile-details {
   display: flex;
   align-items: center;
@@ -848,18 +1004,17 @@ html.touch .collapsible__body--disable {
 
   .proposal-details--left {
     float: left;
+    width: 50%;
   }
 
-  .proposal-video {
-    max-width: 50%;
-  }
-
-  .proposal-details--talk__box {
-    border-right: solid 1px #e3e3e3;
+  .proposal-details--right {
+    float: right;
+    width: 50%;
+    margin-top: 40px;
   }
 
-  .proposal-details--talk__box:last-child {
-    border-right: 0;
+  .proposal-video {
+    max-width: 50%;
   }
 }
 @media (min-width: 1200px) {
@@ -996,6 +1151,118 @@ html.touch .collapsible__body--disable {
   margin: 10px 0 0 20px;
 }
 
+.label {
+  padding: 5px 10px;
+  border: 2px solid #F0F2F5;
+  background-color: #F6F8FA;
+  border-radius: 20px;
+  display: inline-block;
+  margin: 0 10px 10px 0;
+  text-decoration: none;
+}
+
+.label:hover {
+  text-decoration: none;
+}
+
+.selected-label {
+  border-bottom: 1px solid #ccc;
+  width: 100%;
+  position: relative;
+  cursor: pointer;
+}
+.selected-label .material-icons {
+  position: absolute;
+  bottom: 10px;
+  right: 0;
+}
+
+.add-label-form .label-dropdown-wrapper {
+  position: relative;
+  margin-bottom: 10px;
+}
+.add-label-form fieldset {
+  border: none;
+  position: absolute;
+  top: -500px;
+  z-index: -1;
+  left: 0px;
+  width: 100%;
+  margin: 0px;
+  padding: 10px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
+  background-color: white;
+  margin: 0;
+  -webkit-transition: top 0.25s linear, z-index 0.1s step-start;
+  -moz-transition: top 0.25s linear, z-index 0.1s step-start;
+  -ms-transition: top 0.25s linear, z-index 0.1s step-start;
+  -o-transition: top 0.25s linear, z-index 0.1s step-start;
+}
+.add-label-form fieldset legend {
+  display: none;
+}
+.add-label-form fieldset.active {
+  top: 0;
+  z-index: 1;
+  -webkit-transition: top 0.25s linear, z-index 0.25s step-end;
+  -moz-transition: top 0.25s linear, z-index 0.25s step-end;
+  -ms-transition: top 0.25s linear, z-index 0.25s step-end;
+  -o-transition: top 0.25s linear, z-index 0.25s step-end;
+  transition: top 0.25s linear, z-index 0.25s step-end;
+}
+.add-label-form .listwidget .mui-textfield {
+  margin-bottom: 0;
+  padding-top: 0;
+}
+.add-label-form .listwidget .mui-form__label {
+  font-size: 14px;
+  line-height: 24px;
+  overflow: auto;
+  margin: 0;
+  position: relative;
+  color: #1F2D3D;
+  padding-left: 20px;
+}
+.add-label-form .listwidget ul {
+  padding-left: 20px;
+}
+.add-label-form .listwidget .mui-form__label:before,
+.add-label-form .listwidget .mui-form__label:after {
+  position: absolute;
+  content: "";
+  display: inline-block;
+}
+.add-label-form .listwidget .mui-form__label:before {
+  height: 13px;
+  width: 13px;
+  border: 1px solid #ccc;
+  left: 0px;
+  top: 4px;
+  border-radius: 3px;
+}
+.add-label-form .listwidget .mui-form__label:after {
+  height: 4px;
+  width: 8px;
+  border-left: 1.4px solid #fff;
+  border-bottom: 1.2px solid #fff;
+  transform: rotate(-61deg);
+  left: 2px;
+  top: 8px;
+}
+.add-label-form .listwidget .mui-form__label:after {
+  content: none;
+}
+.add-label-form .listwidget .mui-form__label.checked:before {
+  background: #3A99FC;
+  border: none;
+}
+.add-label-form .listwidget .mui-form__label.checked:after {
+  content: "";
+}
+.add-label-form .mui-checkbox {
+  margin-bottom: 0;
+}
+
 .proposal-list-header {
   margin: 1px 0 0;
   width: 100%;
@@ -1284,78 +1551,43 @@ body > .proposal-box.ui-draggable {
   margin-top: 10px;
 }
 
-.ui-dragable-box {
-  padding: 25px 10px 10px 20px;
-  border-radius: 3px;
-  border: 1px solid #333;
-  background: #FFF;
-  cursor: pointer;
-  position: relative;
-  margin: 10px 15px;
-}
-
-.ui-dragable-box--header {
-  border: 1px solid #ddd;
-  padding: 0;
+.label-box {
   margin: 10px 0;
+  padding: 10px;
 }
-
-.ui-dragable-box--header .collapsible__header {
-  margin: 0;
-}
-
-.ui-dragable-box label {
-  cursor: pointer;
-}
-
-.ui-dragable-box .drag-icon {
-  position: absolute;
-  left: 5px;
-  top: 0;
+.label-box .label-box__icon {
+  float: left;
+  margin-top: 15px;
 }
-
-.ui-dragable-box:hover {
+.label-box .label-box__icon--right {
+  float: right;
+  padding: 0 15px;
+  box-shadow: none;
+  border: none;
   cursor: pointer;
-  box-shadow: 0 1px 3px rgba(158, 158, 158, 0.12), 0 1px 2px rgba(158, 158, 158, 0.24);
 }
-
-.ui-box-placeholder, .ui-box-placeholder--bigger {
-  margin: 10px 15px;
-  padding: 10px;
-  border-radius: 3px;
-  border: 1px solid #ddd;
-  background: #FFF;
-  height: 55px;
+.label-box .label-box__heading {
+  margin: 15px 10px;
+  display: inline-block;
 }
-
-.ui-box-placeholder--bigger {
-  margin: 10px 0;
-  height: 80px;
+.label-box .sublabel-wrapper {
+  display: inline-block;
+  max-width: 80%;
 }
-
-.seq-input {
-  position: absolute;
-  right: 0px;
-  width: 20px;
-  border: 0;
-  top: 5px;
-  font-size: 14px;
-  line-height: 1;
-  color: #8492A6;
+.label-box .label-box__subheading {
+  margin-right: 10px;
 }
-
-.seq-input--bg {
-  background: #EFF2F7;
+.label-box .label-box__action {
+  float: right;
 }
 
-.seq-input:focus,
-.seq-input:active {
-  outline: none;
+.label-box--new {
+  margin: 15px auto 35px;
+  width: 100%;
+  max-width: 500px;
 }
-
-.ui-dragable-box .sp-replacer {
-  margin-top: 5px;
-  margin-left: 5px;
+.label-box--new a:hover {
+  text-decoration: none;
 }
 
 .footer {
diff --git a/funnel/static/sass/_card.scss b/funnel/static/sass/_card.scss
index 839fb8fb9..8d5e27574 100644
--- a/funnel/static/sass/_card.scss
+++ b/funnel/static/sass/_card.scss
@@ -97,3 +97,23 @@
   }
 }
 
+.card__body--minheight {
+  min-height: 150px;
+}
+
+.card__body--new {
+  min-height: 194px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  .new-btn:hover {
+    text-decoration: none;
+  }
+}
+
+.card--small {
+  max-width: 400px;
+  margin-top: 10px;
+}
+
diff --git a/funnel/static/sass/_form.scss b/funnel/static/sass/_form.scss
new file mode 100644
index 000000000..86190db5c
--- /dev/null
+++ b/funnel/static/sass/_form.scss
@@ -0,0 +1,162 @@
+.cfp-action-btn {
+  padding: 10px 0;
+  cursor: pointer;
+  margin-right: 10px; 
+  border: none;
+  color: #4A90E2;
+  background: none;
+}
+
+
+.cfp-action-btn:focus,
+.cfp-action-btn:hover {
+  border: none;
+  outline: none;
+  box-shadow: none;
+  color: #4A90E2;
+}
+
+.inline-form {
+  display: inline-block;
+  vertical-align: middle;
+}
+
+.label-form {
+  max-width: 500px;
+
+  .label-form__title-field {
+    width: calc(100% - 130px);
+    display: inline-block;
+  }
+
+  .label-form__title-field--close {
+    width: calc(100% - 114px);
+  }
+
+  .label-form__subform__close-btn {
+    position: absolute;
+    top: 0;
+    z-index: 100;
+    right: 5px;
+    background: #fff;
+  }
+
+  .label-form__subform {
+    margin-left: 20px;
+  }
+
+  .emojipicker {
+    float: left;
+    width: 70px;
+    height: 48px;
+    margin-right: 20px;
+
+    label {
+      display: none;
+    }
+
+    .emojionearea-editor {
+      height: 48px;
+      min-height: 20px;
+      overflow: hidden;
+      white-space: nowrap;
+      position: absolute;
+      top: 0;
+      left: 12px;
+      right: 24px;
+      padding: 6px 0;
+    }
+
+    .emojionearea-button {
+      top: 10px;
+    }
+
+    .emojionearea-editor {
+      left: 6px !important;
+      padding-right: 45px !important;
+    }
+
+    .emojionearea-button .emojionearea-button-open,
+    .emojionearea-button .emojionearea-button-close {
+      right: 3px;
+    }
+
+    .emojionearea .emojionearea-editor [class*=emojione-], .emojionearea .emojionearea-editor .emojioneemoji {
+      margin: -.2ex 1ex .2ex -0.5ex;
+    }
+  }
+}
+
+.ui-dragable-box {
+  padding: 25px 10px 10px 20px;
+  border-radius: 3px;
+  border: 1px solid #ddd;
+  background: #FFF;
+  cursor: pointer;
+  position: relative;
+  margin: 10px 15px;
+
+  .drag-icon {
+    position: absolute;
+    left: 5px;
+    top: 0;
+  }
+}
+
+.ui-dragable-box__header {
+  padding: 0;
+  margin: 10px 0;
+}
+
+.ui-dragable-box--header .collapsible__header {
+  margin: 0;
+}
+
+.ui-dragable-box label {
+  cursor: pointer;
+}
+
+.ui-dragable-box:hover {
+  cursor: pointer;
+  box-shadow: 0 1px 3px rgba(158,158,158,0.12), 0 1px 2px rgba(158,158,158,0.24);
+}
+
+.ui-box-placeholder {
+  margin: 10px 15px;
+  padding: 10px;
+  border-radius: 3px;
+    border: 1px solid #ddd;
+    background: #FFF;
+    height: 55px;
+}
+
+.ui-box-placeholder--bigger {
+  @extend .ui-box-placeholder;
+  margin: 10px 0;
+  height: 80px;
+}
+
+.seq-input {
+    position: absolute;
+    right: 0px;
+    width: 20px;
+    border: 0;
+    top: 5px;
+    font-size: 14px;
+    line-height: 1;
+    color: #8492A6;
+}
+
+.seq-input--bg {
+  background: #EFF2F7;
+}
+
+.seq-input:focus,
+.seq-input:active {
+  outline: none;
+}
+
+.ui-dragable-box .sp-replacer {
+  margin-top: 5px;
+  margin-left: 5px;
+}
diff --git a/funnel/static/sass/_label.scss b/funnel/static/sass/_label.scss
new file mode 100644
index 000000000..e392cb887
--- /dev/null
+++ b/funnel/static/sass/_label.scss
@@ -0,0 +1,45 @@
+.label-box {
+  margin: 10px 0;
+  padding: 10px;
+
+  .label-box__icon {
+    float: left;
+    margin-top: 15px;
+  }
+
+  .label-box__icon--right {
+    float: right;
+    padding: 0 15px;
+    box-shadow: none;
+    border: none;
+    cursor: pointer;
+  }
+
+  .label-box__heading {
+    margin: 15px 10px;
+    display: inline-block;
+  }
+
+  .sublabel-wrapper {
+    display: inline-block;
+    max-width: 80%
+  }
+
+  .label-box__subheading {
+    margin-right: 10px;
+  }
+
+  .label-box__action {
+    float: right;
+  }
+}
+
+.label-box--new {
+  margin: 15px auto 35px;
+  width: 100%;
+  max-width: 500px;
+
+  a:hover {
+    text-decoration: none;
+  }
+}
diff --git a/funnel/static/sass/_layout.scss b/funnel/static/sass/_layout.scss
index 60e16a26e..a2233f810 100644
--- a/funnel/static/sass/_layout.scss
+++ b/funnel/static/sass/_layout.scss
@@ -153,6 +153,7 @@ html.touch .collapsible__body--disable {
     position: -webkit-sticky;
     top: 70px;
     order: 1;
+    z-index: 5;
   }
 }
 
@@ -189,29 +190,6 @@ html.touch .collapsible__body--disable {
   margin-bottom: 10px;
 }
 
-.cfp-action-btn {
-  padding: 10px 0;
-  cursor: pointer;
-  margin-right: 10px; 
-  border: none;
-  color: #4A90E2;
-  background: none;
-}
-
-
-.cfp-action-btn:focus,
-.cfp-action-btn:hover {
-  border: none;
-  outline: none;
-  box-shadow: none;
-  color: #4A90E2;
-}
-
-.inline-form {
-  display: inline-block;
-  vertical-align: middle;
-}
-
 .past-events-table {
   border-collapse: collapse;
 
@@ -238,3 +216,12 @@ html.touch .collapsible__body--disable {
   font-size: 24px;
   margin-top: -30px;
 }
+
+.mui-btn--nopadding {
+  padding-left: 0;
+  padding-right: 0;
+}
+
+.mui-btn--nopadding:hover {
+  background: transparent !important;
+}
diff --git a/funnel/static/sass/_proposal.scss b/funnel/static/sass/_proposal.scss
index e54c610e5..e55dc10f5 100644
--- a/funnel/static/sass/_proposal.scss
+++ b/funnel/static/sass/_proposal.scss
@@ -158,18 +158,17 @@
 
   .proposal-details--left {
     float: left;
+    width: 50%;
   }
 
-  .proposal-video {
-    max-width: 50%;
-  }
-
-  .proposal-details--talk__box {
-    border-right: solid 1px #e3e3e3;
+  .proposal-details--right {
+    float: right;
+    width: 50%;
+    margin-top: 40px;
   }
 
-  .proposal-details--talk__box:last-child {
-    border-right: 0;
+  .proposal-video {
+    max-width: 50%;
   }
 }
 
@@ -308,3 +307,131 @@
 .comment--body {
   margin: 10px 0 0 20px;
 }
+
+.label {
+  padding: 5px 10px;
+  border: 2px solid #F0F2F5;
+  background-color: #F6F8FA;
+  border-radius: 20px;
+  display: inline-block;
+  margin: 0 10px 10px 0;
+  text-decoration: none;
+}
+
+.label:hover {
+  text-decoration: none;
+}
+
+.selected-label {
+  border-bottom: 1px solid #ccc;
+  width: 100%;
+  position: relative;
+  cursor: pointer;
+
+  .material-icons {
+    position: absolute;
+    bottom: 10px;
+    right: 0;
+  }
+}
+
+.add-label-form {
+  .label-dropdown-wrapper {
+    position: relative;
+    margin-bottom: 10px;
+  }
+  fieldset {
+    border: none;
+    position: absolute;
+    top: -500px;
+    z-index: -1;
+    left: 0px;
+    width: 100%;
+    margin: 0px;
+    padding: 10px;
+    box-shadow: 0 1px 3px rgba(0,0,0,.12), 0 1px 2px rgba(0,0,0,.24);
+    background-color: white;
+    margin: 0;
+    -webkit-transition: top 0.25s linear, z-index 0.1s step-start;
+    -moz-transition: top 0.25s linear, z-index 0.1s step-start;
+    -ms-transition: top 0.25s linear, z-index 0.1s step-start;
+    -o-transition: top 0.25s linear, z-index 0.1s step-start;
+
+    legend {
+      display: none;
+    }
+  }
+
+  fieldset.active {
+    top: 0;
+    z-index: 1;
+    -webkit-transition: top 0.25s linear, z-index 0.25s step-end;
+    -moz-transition: top 0.25s linear, z-index 0.25s step-end;
+    -ms-transition: top 0.25s linear, z-index 0.25s step-end;
+    -o-transition: top 0.25s linear, z-index 0.25s step-end;
+    transition: top 0.25s linear, z-index 0.25s step-end;
+  }
+
+  .listwidget {
+    .mui-textfield {
+      margin-bottom: 0;
+      padding-top: 0;
+    }
+    .mui-form__label {
+      font-size: 14px;
+      line-height: 24px;
+      overflow: auto;
+      margin: 0;
+      position: relative;
+      color: #1F2D3D;
+      padding-left: 20px;
+    }
+
+    ul {
+      padding-left: 20px;
+    }
+
+    .mui-form__label:before,
+    .mui-form__label:after {
+      position: absolute;
+      content: "";
+      display: inline-block;
+    }
+
+    .mui-form__label:before{
+      height: 13px;
+      width: 13px;
+      border: 1px solid #ccc;
+      left: 0px;
+      top: 4px;
+      border-radius: 3px;
+    }
+
+    .mui-form__label:after {
+      height: 4px;
+      width: 8px;
+      border-left: 1.4px solid #fff;
+      border-bottom: 1.2px solid #fff;
+      transform: rotate(-61deg);
+      left: 2px;
+      top: 8px;
+    }
+
+    .mui-form__label:after {
+      content: none;
+    }
+
+    .mui-form__label.checked:before {
+      background: #3A99FC;
+      border: none;
+    }
+    .mui-form__label.checked:after {
+      content: "";
+    }
+  }
+
+  .mui-checkbox {
+    margin-bottom: 0;
+  }
+    
+}
diff --git a/funnel/static/sass/_schedule.scss b/funnel/static/sass/_schedule.scss
index 542d2025c..bce5b4b03 100644
--- a/funnel/static/sass/_schedule.scss
+++ b/funnel/static/sass/_schedule.scss
@@ -293,78 +293,3 @@ body>.proposal-box.ui-draggable {
 	margin-top: 10px;
 }
 
-.ui-dragable-box {
-	padding: 25px 10px 10px 20px;
-	border-radius: 3px;
-  	border: 1px solid #333;
-  	background: #FFF;
-  	cursor: pointer;
-  	position: relative;
-  	margin: 10px 15px;
-}
-
-.ui-dragable-box--header {
-	border: 1px solid #ddd;
-	padding: 0;
-	margin: 10px 0;
-}
-
-.ui-dragable-box--header .collapsible__header {
-	margin: 0;
-}
-
-.ui-dragable-box label {
-	cursor: pointer;
-}
-
-.ui-dragable-box .drag-icon {
-	position: absolute;
-	left: 5px;
-    top: 0;
-}
-
-.ui-dragable-box:hover {
-	cursor: pointer;
-	box-shadow: 0 1px 3px rgba(158,158,158,0.12), 0 1px 2px rgba(158,158,158,0.24);
-}
-
-.ui-box-placeholder {
-	margin: 10px 15px;
-	padding: 10px;
-	border-radius: 3px;
-  	border: 1px solid #ddd;
-  	background: #FFF;
-  	height: 55px;
-}
-
-.ui-box-placeholder--bigger {
-	@extend .ui-box-placeholder;
-	margin: 10px 0;
-	height: 80px;
-}
-
-.seq-input {
-    position: absolute;
-    right: 0px;
-    width: 20px;
-    border: 0;
-    top: 5px;
-    font-size: 14px;
-    line-height: 1;
-    color: #8492A6;
-}
-
-.seq-input--bg {
-	background: #EFF2F7;
-}
-
-.seq-input:focus,
-.seq-input:active {
-	outline: none;
-}
-
-.ui-dragable-box .sp-replacer {
-	margin-top: 5px;
-	margin-left: 5px;
-}
-
diff --git a/funnel/static/sass/app.scss b/funnel/static/sass/app.scss
index 8d28f192c..300abff5e 100644
--- a/funnel/static/sass/app.scss
+++ b/funnel/static/sass/app.scss
@@ -5,9 +5,11 @@
 @import "layout";
 @import "header";
 @import "home";
+@import "form";
 @import "card";
 @import "project";
 @import "proposal";
 @import "proposals";
 @import "schedule";
+@import "label";
 @import "footer";
diff --git a/funnel/templates/labels.html.jinja2 b/funnel/templates/labels.html.jinja2
new file mode 100644
index 000000000..1cd06585f
--- /dev/null
+++ b/funnel/templates/labels.html.jinja2
@@ -0,0 +1,109 @@
+{% extends "layout.html.jinja2" %}
+{% from "baseframe/forms.html.jinja2" import renderfield %}
+{% block title %}{% trans %}Labels{% endtrans %} &ndash; {{ project.title }}{% endblock %}
+
+{% block top_title %}
+  <h1 class="mui--text-display1">{{ project.title|e }}</h1>
+  <p class="mui--text-headline">Manage labels</p>
+{% endblock %}
+
+{% block contentwrapper %}
+<div class="grid">
+  <div class="grid__col-xs-12">
+    <div class="clickable-card card label-box label-box--new mui--z2" data-href="{{ project.url_for('new_label') }}" title="New label">
+      <div class="card__body mui--text-center">
+        <a class="mui--text-headline mui--text-light" href="{{ project.url_for('new_label') }}" title="New labelset" data-action="New labelset"><i class="material-icons mui--align-middle mui--text-display1">add</i> Create new label</a>
+      </div>
+    </div>
+  </div>
+  <div class="grid__col-xs-12">
+    <form data-parsley-validate="true" id="label-form" method="POST" action="{{ request.url }}" accept-charset="UTF-8" class="mui-form">
+      {{ form.hidden_tag() }}
+      {%- for label in labels %}
+        <div class="ui-dragable-box label-box" data-drag-placeholder="ui-box-placeholder--bigger" draggable="true"">
+          <i class="material-icons mui--text-body1 mui--text-light label-box__icon">drag_indicator</i>
+          <input name="name" value="{{ label.name }}" type="hidden" class="id-input">
+          {% if label.has_options %}
+            <h3 class="mui--text-title mui--text-bold label-box__heading">{% if label.icon_emoji %}{{ label.icon_emoji }}{% endif %} {{ label.title }}</h3>
+            <div class="sublabel-wrapper">
+              {%- for option in label.options %}
+                <span class="mui--text-subhead mui--text-light label-box__subheading">{% if option.icon_emoji %}{{ option.icon_emoji }} {% endif %}{{ option.title }}</span>
+              {% else %}
+                <span class="mui--text-subhead mui--text-light"><em>{% trans %}(No labels){% endtrans %}</em></span>
+              {%- endfor %}
+            </div>
+          {% else %}
+            <h3 class="mui--text-title mui--text-bold label-box__heading">{{ label.title }}</h3>
+          {% endif %}
+          {% if label.has_proposals %}
+            <a class="label-box__icon label-box__icon--right js-delete-btn" href="{{ label.url_for('archive') }}" title="{% trans %}Archive{% endtrans %}"><i class="material-icons mui--text-title mui--text-light">archive</i></a>
+          {% else %}
+            <a class="label-box__icon label-box__icon--right js-delete-btn" href="{{ label.url_for('delete') }}" title="{% trans %}Delete{% endtrans %}"><i class="material-icons mui--text-title mui--text-light">delete</i></a>
+          {% endif %}
+            <a class="label-box__icon label-box__icon--right" href="{{ label.url_for('edit') }}" title="{% trans %}Edit{% endtrans %}"><i class="material-icons mui--text-title mui--text-light">edit</i></a>
+        </div>
+      {%- endfor %}
+      <div class="mui-form form-actions clearfix">
+        <div>
+          <button type="submit" name="submit" class="mui-btn mui-btn--raised mui-btn--primary" value="reject">Save</button>
+          <span class="loading mui--hide"></span>
+        </div>
+      </div>
+    </form>
+  </div>
+</div>
+{% endblock %}
+
+{% block footerscripts %}
+  {% assets "js_sortable" -%}
+    <script type="text/javascript" src="{{ ASSET_URL }}"></script>
+  {%- endassets -%}
+  <script type="text/javascript">
+    $(function() {
+      function applySortable() {
+        $(this).sortable({
+          placeholder: $(this).data('drag-placeholder'),
+          cursor: 'move',
+          update: function() {
+              $(this).children().each(function(index) {
+                $(this).children('input[name$="seq"]').val(++index);
+              });
+          }
+        });
+      }
+      $("#label-form").each(applySortable);
+
+      $('.js-delete-btn').click(function(event) {
+        event.preventDefault();
+        var btnTitle = $(this).attr('title').toLowerCase();
+        var url = $(this).attr('href');
+        var text = "Are you sure you want to " + btnTitle;
+        var csrftoken = 'csrf_token=' + document.head.querySelector("[name=csrf-token]").content;
+        if(window.confirm(text)) {
+          $.ajax({
+            type: 'POST',
+            url: url,
+            data : csrftoken,
+            success: function() {
+              window.location.href = window.location.href;
+            },
+            error(response) {
+              var errorMsg = '';
+              if (response.readyState === 4) {
+                if (response.status === 500) {
+                  errorMsg ='Internal Server Error. Please reload and try again.';
+                } else {
+                  errorMsg = JSON.parse(response.responseText).error_description;
+                }
+              } else {
+                errorMsg = 'Unable to connect. Please reload and try again.';
+              }
+              window.toastr.error(errorMsg);
+            }
+          });
+        }
+      })
+
+    });
+  </script>
+{% endblock %}
diff --git a/funnel/templates/labels_form.html.jinja2 b/funnel/templates/labels_form.html.jinja2
new file mode 100644
index 000000000..f52c2f080
--- /dev/null
+++ b/funnel/templates/labels_form.html.jinja2
@@ -0,0 +1,126 @@
+{% extends "formlayout.html.jinja2" %}
+{% from "baseframe/forms.html.jinja2" import renderfield %}
+{% block title %}{{ title }}{% endblock %}
+
+{% block pageheaders %}
+  {% assets "css_emojionearea" -%}
+    <link rel="stylesheet" type="text/css" href="{{ ASSET_URL }}" />
+  {%- endassets -%}
+{% endblock %}
+
+{% macro labelformfields(lform, subform=false, empty=false) %}
+  {%- if subform %}
+    <div class="ui-dragable-box" data-drag-placeholder="ui-box-placeholder--bigger" draggable="true">
+      {{ lform.hidden_tag() }}
+      <i class="material-icons mui--text-body1 drag-icon">drag_indicator</i>
+      {{ renderfield(lform.seq, css_class="seq-input") }}
+  {%- endif %}
+  {{ renderfield(lform.icon_emoji, css_class="emojipicker") }}
+  {%- for error in lform.icon_emoji.errors %}
+    <div><p class="mui-form__error">{{ error }}</p></div>
+  {%- endfor %}
+  {%- if not empty %}
+    {{ renderfield(lform.title, autofocus=true, css_class="label-form__title-field") }}
+  {%- else -%}
+    {{ renderfield(lform.title, autofocus=true, css_class="label-form__title-field label-form__title-field--close") }}
+  {%- endif %}
+  {%- for error in lform.title.errors %}
+    <div><p class="mui-form__error">{{ error }}</p></div>
+  {%- endfor %}
+    {%- if empty %}<button class="mui-btn--nostyle js-remove-sublabel-form label-form__subform__close-btn"><i class="material-icons mui--text-body1">close</i></button>{%- endif %}
+    <!-- Add archive button for existing sublabels -->
+  {%- if subform %}
+    </div>
+  {%- endif %}
+{% endmacro %}
+
+{% block content %}
+  {%- if form.errors %}
+    <div class="alert alert--error alert--dismissable">
+      <a class="alert__close" href="javascript:void(0);" aria-label="close"><i class="material-icons">clear</i></a>
+      <p class="alert__text"><i class="material-icons alert__icon">error</i>{% trans %}Please review the indicated issues{% endtrans %}</p>
+    </div>
+  {%- endif %}
+  {%- if message %}
+    <p class="form-message">{{ message }}</p>
+  {%- endif %}
+  <form data-parsley-validate="true" id="label-form" method="POST" action="{{ request.url }}" accept-charset="UTF-8" class="mui-form mui-form--margins label-form">
+    {{ form.hidden_tag() }}
+    {{ labelformfields(form) }}
+    <div id="child-form" class="label-form__subform">
+      {% if form.edit_obj and form.edit_obj.has_options and subforms %}
+        {% for subform in subforms %}
+          {{ labelformfields(subform, subform=true) }}
+        {% endfor %}
+      {% endif %}
+    </div>
+    <div><button class="mui-btn mui-btn--raised mui-btn--accent" id="add-sublabel-form"><i class="material-icons mui--align-middle mui--text-subhead">add</i> Add option</button></div>
+    {%- if subforms|length > 0 %}
+      {{ renderfield(form.required) }}
+    {%- else -%}
+      {{ renderfield(form.required, css_class="mui--hide js-required-field") }}
+    {% endif %}
+    {%- for error in form.required.errors %}
+      <div><p class="mui-form__error">{{ error }}</p></div>
+    {%- endfor %}
+    {{ renderfield(form.restricted) }}
+    {%- for error in form.restricted.errors %}
+      <div><p class="mui-form__error">{{ error }}</p></div>
+    {%- endfor %}
+    <div class="mui-form form-actions clearfix">
+      <div>
+        <button type="submit" name="submit" class="mui-btn mui-btn--raised mui-btn--primary" value="reject">Submit</button>
+        <span class="loading mui--hide"></span>
+      </div>
+    </div>
+  </form>
+{% endblock %}
+
+{% block footerscripts %}
+  {% assets "js_emojionearea" -%}
+    <script type="text/javascript" src="{{ ASSET_URL }}"></script>
+  {%- endassets -%}
+  {% assets "js_sortable" -%}
+    <script type="text/javascript" src="{{ ASSET_URL }}"></script>
+  {%- endassets -%}
+  <script type="text/javascript">
+    $(function() {
+      function initEmojiPicker() {
+        $('input.field-icon_emoji:not([style*="display: none"])').emojioneArea({
+          pickerPosition: "right",
+          autocomplete: false,
+          standalone: true
+        });
+      }
+      function applySortable() {
+        $(this).sortable({
+          placeholder: $(this).data('drag-placeholder'),
+          cursor: 'move',
+          update: function() {
+              $(this).children().each(function(index) {
+                $(this).children('input[name$="seq"]').val(++index);
+              });
+          }
+        });
+      }
+      $('#add-sublabel-form').click(function(event) {
+        event.preventDefault();
+        var formHtml = {{ labelformfields(emptysubform, subform=true, empty=true)|tojson|safe }};
+        $('#child-form').append(formHtml);
+        activate_widgets();
+        initEmojiPicker();
+        $('.js-required-field').removeClass('mui--hide');
+        $('.js-required-field input').prop('checked', true);
+        $("#child-form").each(applySortable);
+      });
+      $('#child-form').on('click', '.js-remove-sublabel-form', function() {
+        event.preventDefault();
+        console.log('this', $(this));
+        $(this).parent().remove();
+      });
+      initEmojiPicker();
+      $("#child-form").each(applySortable);
+    });
+  </script>
+  <script src="{{ 'parsley.js'|ext_asset_url }}" type="text/javascript"></script>
+{% endblock %}
diff --git a/funnel/templates/macros.html.jinja2 b/funnel/templates/macros.html.jinja2
index 74825ae49..306f39814 100644
--- a/funnel/templates/macros.html.jinja2
+++ b/funnel/templates/macros.html.jinja2
@@ -179,7 +179,7 @@
                 <a href="{{ project.url_for('edit_schedule') }}" title="Edit schedule">{% trans %}Edit schedule{% endtrans %}</a>
               </li>
               <li>
-                <a href="{{ project.url_for('sections') }}" title="Manage sections">{% trans %}Manage sections{% endtrans %}</a>
+                <a href="{{ project.url_for('labels') }}" title="Manage labels">{% trans %}Manage labels{% endtrans %}</a>
               </li>
               <li>
                 <a href="{{ project.url_for('venues') }}" title="Manage venues">{% trans %}Manage venues{% endtrans %}</a>
diff --git a/funnel/templates/proposal.html.jinja2 b/funnel/templates/proposal.html.jinja2
index bcc81f889..4b62419b4 100644
--- a/funnel/templates/proposal.html.jinja2
+++ b/funnel/templates/proposal.html.jinja2
@@ -1,5 +1,5 @@
 {% extends "layout.html.jinja2" %}
-{% from "baseframe/forms.html.jinja2" import renderfield, renderform %}
+{% from "baseframe/forms.html.jinja2" import renderfield, renderform, rendersubmit %}
 {% from "comments.html.jinja2" import commenttree %}
 {% block title %}{{ proposal.title }} &ndash; {{ project.title }}{% endblock %}
 {% block description %}
@@ -21,6 +21,18 @@
 {% block top_title %}
   <h1 class="mui--text-display1"><strong>{{ project.title|e }}</strong></h1>
   <p class="mui--text-headline">{{ project.tagline|safe }}</p>
+  <p>
+  {%- if project.boxoffice_data and project.boxoffice_data.item_collection_id -%}
+    <a class="mui-btn mui-btn--small mui-btn--primary mui--d-inlineblock" href="{{ project.url_for() }}#participate" title="Participate" data-action="Participate(header-proposalpage)">Participate</a>
+  {%- elif project.buy_tickets_url.url %}
+    <a class="mui-btn mui-btn--small mui-btn--primary mui--d-inlineblock" href="{{ project.buy_tickets_url }}" title="Participate" data-action="Participate(header-proposalpage)">Participate</a>
+  {%- elif project.allow_rsvp %}
+    <a class="mui-btn mui-btn--small mui-btn--primary mui--d-inlineblock" href="{{ project.url_for() }}#participate" title="Participate" data-action="Participate(header-proposalpage)">Participate</a>
+  {%- endif %}
+  {% if project.cfp_state.PUBLIC -%}
+    <a class="mui-btn mui-btn--flat mui-btn--nopadding" href="{{ project.url_for('new_proposal') }}" title="Propose a session" data-action="Propose a session(header)"><i class="material-icons mui--text-subhead mui--align-middle">mic</i>{% trans %}Propose a session{% endtrans %}</a>
+  {% endif %}
+  </p>
 {% endblock %}
 
 {% block contentwrapper %}
@@ -86,36 +98,10 @@
             </div>
           {% endif %}
         </div>
-      </div>
-      <div class="proposal-details--talk">
-        <div class="grid">
-          <div class="grid__col-auto proposal-details--talk__box">
-            <p class="mui--text-body2 mui--text-light zero-bottom-margin">Technical level</p>
-            <p class="mui--text-title">{{ proposal.technical_level }}</p>
-          </div>
-          {%- if proposal.section %}
-          <div class="grid__col-auto proposal-details--talk__box mui--text-center">
-            <p class="mui--text-body2 mui--text-light zero-bottom-margin">{% trans %}Section{% endtrans %}</p>
-            <p class="mui--text-title">{{ proposal.section.title }}</p>
-          </div>
-          {%- endif %}
-          {%- if proposal.session_type %}
-          <div class="grid__col-auto proposal-details--talk__box mui--text-center">
-            <p class="mui--text-body2 mui--text-light zero-bottom-margin">{% trans %}Session type{% endtrans %}</p>
-            <p class="mui--text-title">{{ proposal.session_type }}</p>
-          </div>
-          {%- endif %}
-          <div class="grid__col-auto proposal-details--talk__box mui--text-center">
-            <p class="mui--text-body2 mui--text-light zero-bottom-margin">Status</p>
-            {%- if project.current_roles.admin %}
-              <p class="mui--text-title zero-bottom-margin">{{ proposal.state.label.title }}</p>
-            {%- else %}
-              <p class="mui--text-title zero-bottom-margin">{% if proposal.state.CONFIRMED %}{{ proposal.state.label.title }}{% else %}{% trans %}Submitted{% endtrans %}{% endif %}</p>
-            {% endif %}
-            {% if proposal.state.SCHEDULED %}
-              <p class="mui--text-subhead zero-bottom-margin"><a class="" href="{{ proposal.session.url_for() }}">View proposal in schedule</a></p>
-            {% endif %}
-          </div>
+        <div class="proposal-details proposal-details--right">
+          {%- for label in proposal.labels %}
+            <span class="label mui--text-bold">{% if label.icon_emoji %}{{ label.icon_emoji }} {% endif %}{% if label.main_label %}{{ label.main_label.title }}: {% endif %}{{ label.title }}</span>
+          {%- endfor %}
         </div>
       </div>
     </section>
@@ -217,6 +203,22 @@
                   </p>
                 </form>
               {% endif %}
+              {%- if proposal_label_admin_form %}
+                <form action="{{ proposal.url_for('edit_labels') }}" method="post" class="add-label-form">
+                  {{ proposal_label_admin_form.hidden_tag() }}
+                  <p class="mui--text-title">Labels</p>
+                  <div class="selected-label" id="label-select">
+                    {%- for label in proposal.labels %}
+                      <span class="label mui--text-caption mui--text-bold" data-labeltxt="{% if label.main_label %}{% if label.main_label.icon_emoji -%}{{ label.main_label.icon_emoji }} {{ label.main_label.title }}{% else -%}{{ label.main_label.title }}{% endif %}{% elif label.icon_emoji -%}{{ label.icon_emoji }} {{ label.title }}{% else -%}{{ label.title }}{% endif %}">{% if label.main_label %}{% if label.main_label.icon_emoji %}{{ label.main_label.icon_emoji }} {% endif %} {{ label.main_label.title }}: {% endif %}{% if label.icon_emoji %}{{ label.icon_emoji }} {% endif %} {{ label.title }}</span>
+                    {%- endfor %}
+                    <i class="material-icons mui--text-light">arrow_drop_down</i>
+                  </div>
+                  <div id="label-dropdown" class="label-dropdown-wrapper">
+                    {{ renderfield(proposal_label_admin_form.formlabels, css_class="label-select-fields") }}
+                  </div>
+                  {{ rendersubmit([(None, "Save", '')]) }}
+                </form>
+              {%- endif %}
             </div>
           </div>
         {% endif %}
@@ -318,8 +320,10 @@
       proposalConfig.videoUrl = proposalConfig.videoWrapper.getAttribute('data-href');
     }
     HasGeek.ProposalInit(proposalConfig);
+
   });
 </script>
 <script type="text/javascript" src="//apis.google.com/js/plusone.js"></script>
 <script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>
+<script src="{{ 'parsley.js'|ext_asset_url }}" type="text/javascript"></script>
 {% endblock %}
diff --git a/funnel/util.py b/funnel/util.py
index 1f2fb7c32..8686d3b48 100644
--- a/funnel/util.py
+++ b/funnel/util.py
@@ -75,6 +75,7 @@ def split_name(fullname):
     return unicode(name_splits[0]), unicode(" ".join([s for s in name_splits[1:]]))
 
 
+# TODO: Added tests for this
 def make_qrcode(data):
     """
     Makes a QR code in-memory and returns the raw svg
diff --git a/funnel/views/__init__.py b/funnel/views/__init__.py
index 9d9cbd77f..737e63a23 100644
--- a/funnel/views/__init__.py
+++ b/funnel/views/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
 
-from . import (index, login, profile, project, section, proposal, commentvote, venue,
-    schedule, session, event, participant)
+from . import (index, login, profile, project, section, proposal, commentvote,
+    venue, schedule, session, event, participant, label)
diff --git a/funnel/views/label.py b/funnel/views/label.py
new file mode 100644
index 000000000..b0265eb48
--- /dev/null
+++ b/funnel/views/label.py
@@ -0,0 +1,201 @@
+# -*- coding: utf-8 -*-
+
+from flask import flash, redirect, g, request
+from werkzeug.datastructures import MultiDict
+from coaster.views import render_with, requires_permission, route, UrlForView, ModelView
+from baseframe import _, forms
+
+from .. import app, funnelapp, lastuser
+from ..models import Label, db, Project, Profile
+from ..forms import LabelForm, LabelOptionForm
+from .mixins import ProjectViewMixin
+from .decorators import legacy_redirect
+
+
+@route('/<profile>/<project>/labels')
+class ProjectLabelView(ProjectViewMixin, UrlForView, ModelView):
+    __decorators__ = [legacy_redirect]
+
+    @route('', methods=['GET', 'POST'])
+    @render_with('labels.html.jinja2')
+    @lastuser.requires_login
+    @requires_permission('edit_project')
+    def labels(self):
+        form = forms.Form()
+        if form.validate_on_submit():
+            namelist = request.values.getlist('name')
+            for idx, lname in enumerate(namelist, start=1):
+                lbl = Label.query.filter_by(project=self.obj, name=lname).first()
+                if lbl is not None:
+                    lbl.seq = idx
+                    db.session.commit()
+            flash(_("Your changes have been saved"), category='success')
+        return dict(project=self.obj, labels=self.obj.labels, form=form)
+
+    @route('new', methods=['GET', 'POST'])
+    @lastuser.requires_login
+    @render_with('labels_form.html.jinja2')
+    @requires_permission('admin')
+    def new_label(self):
+        form = LabelForm(model=Label, parent=self.obj.parent)
+        emptysubform = LabelOptionForm(MultiDict({}))
+        if form.validate_on_submit():
+            # This form can send one or multiple values for title and icon_emoji.
+            # If the label doesn't have any options, one value is sent for each list,
+            # and those values are also available at `form.data`.
+            # But in case there are options, the option values are in the list
+            # in the order they appeared on the create form.
+            titlelist = request.values.getlist('title')
+            emojilist = request.values.getlist('icon_emoji')
+            # first values of both lists belong to the parent label
+            titlelist.pop(0)
+            emojilist.pop(0)
+
+            label = Label(title=form.data.get('title'), icon_emoji=form.data.get('icon_emoji'), project=self.obj)
+            label.restricted = form.data.get('restricted')
+            label.make_name()
+            self.obj.labels.append(label)
+            self.obj.labels.reorder()
+            db.session.add(label)
+
+            for idx, title in enumerate(titlelist):
+                subform = LabelOptionForm(MultiDict({
+                    'title': titlelist[idx], 'icon_emoji': emojilist[idx]
+                }), meta={'csrf': False})  # parent form has valid CSRF token
+
+                if not subform.validate():
+                    flash(_("Error with a label option: {}").format(subform.errors.pop()), category='error')
+                    return dict(title="Add label", form=form, project=self.obj)
+                else:
+                    subl = Label(project=self.obj)
+                    subform.populate_obj(subl)
+                    subl.make_name()
+                    db.session.add(subl)
+                    label.options.append(subl)
+
+            db.session.commit()
+            return redirect(self.obj.url_for('labels'), code=303)
+        return dict(title="Add label", form=form, emptysubform=emptysubform, project=self.obj)
+
+
+@route('/<project>/labels', subdomain='<profile>')
+class FunnelProjectLabelView(ProjectLabelView):
+    pass
+
+
+ProjectLabelView.init_app(app)
+FunnelProjectLabelView.init_app(funnelapp)
+
+
+@route('/<profile>/<project>/labels/<label>')
+class LabelView(UrlForView, ModelView):
+    __decorators__ = [lastuser.requires_login, legacy_redirect]
+    model = Label
+    route_model_map = {
+        'profile': 'project.profile.name', 'project': 'project.name',
+        'label': 'name'}
+
+    def loader(self, profile, project, label):
+        proj = Project.query.join(Profile).filter(
+            Profile.name == profile, Project.name == project
+        ).first_or_404()
+        label = self.model.query.filter_by(project=proj, name=label).first_or_404()
+        g.profile = proj.profile
+        return label
+
+    @route('edit', methods=['GET', 'POST'])
+    @lastuser.requires_login
+    @render_with('labels_form.html.jinja2')
+    @requires_permission('edit_project')
+    def edit(self):
+        emptysubform = LabelOptionForm(MultiDict({}))
+        subforms = []
+        if self.obj.is_main_label:
+            form = LabelForm(obj=self.obj, model=Label, parent=self.obj.project)
+            if self.obj.has_options:
+                for subl in self.obj.options:
+                    subforms.append(LabelOptionForm(obj=subl, parent=self.obj.project))
+        else:
+            flash(_("Only main labels can be edited"), category='error')
+            return redirect(self.obj.project.url_for('labels'), code=303)
+
+        if form.validate_on_submit():
+            namelist = request.values.getlist('name')
+            titlelist = request.values.getlist('title')
+            emojilist = request.values.getlist('icon_emoji')
+
+            namelist.pop(0)
+            titlelist.pop(0)
+            emojilist.pop(0)
+
+            for idx, title in enumerate(titlelist):
+                if namelist[idx]:
+                    # existing option
+                    subl = Label.query.filter_by(project=self.obj.project, name=namelist[idx]).first()
+                    subl.title = titlelist[idx]
+                    subl.icon_emoji = emojilist[idx]
+                    subl.seq = idx + 1
+                else:
+                    subform = LabelOptionForm(MultiDict({
+                        'title': titlelist[idx], 'icon_emoji': emojilist[idx]
+                    }), meta={'csrf': False})  # parent form has valid CSRF token
+
+                    if not subform.validate():
+                        flash(_("Error with a label option: {}").format(subform.errors.pop()), category='error')
+                        return dict(title="Edit label", form=form, project=self.obj.project)
+                    else:
+                        subl = Label(project=self.obj.project)
+                        subform.populate_obj(subl)
+                        subl.make_name()
+                        self.obj.project.labels.append(subl)
+                        self.obj.options.append(subl)
+                        self.obj.options.reorder()
+                        db.session.add(subl)
+
+            form.populate_obj(self.obj)
+            db.session.commit()
+            flash(_("Label has been edited"), category='success')
+
+            return redirect(self.obj.project.url_for('labels'), code=303)
+        return dict(title="Edit label", form=form, subforms=subforms, emptysubform=emptysubform, project=self.obj.project)
+
+    @route('archive', methods=['POST'])
+    @lastuser.requires_login
+    @requires_permission('admin')
+    def archive(self):
+        form = forms.Form()
+        if form.validate_on_submit():
+            self.obj.archived = True
+            db.session.commit()
+            flash(_("The label has been archived"), category='success')
+        else:
+            flash(_("CSRF token is missing"), category='error')
+        return redirect(self.obj.project.url_for('labels'), code=303)
+
+    @route('delete', methods=['GET', 'POST'])
+    @lastuser.requires_login
+    @requires_permission('admin')
+    def delete(self):
+        if self.obj.has_proposals:
+            flash(_("Labels that have been assigned to proposals cannot be deleted"), category='error')
+        else:
+            if self.obj.has_options:
+                for olabel in self.obj.options:
+                    db.session.delete(olabel)
+            db.session.delete(self.obj)
+            db.session.commit()
+
+            if self.obj.main_label:
+                self.obj.main_label.options.reorder()
+                db.session.commit()
+            flash(_("The label has been deleted"), category='success')
+        return redirect(self.obj.project.url_for('labels'), code=303)
+
+
+@route('/<project>/labels/<label>', subdomain='<profile>')
+class FunnelLabelView(LabelView):
+    pass
+
+
+LabelView.init_app(app)
+FunnelLabelView.init_app(funnelapp)
diff --git a/funnel/views/proposal.py b/funnel/views/proposal.py
index 706931add..6c1591272 100644
--- a/funnel/views/proposal.py
+++ b/funnel/views/proposal.py
@@ -4,7 +4,6 @@
 from bleach import linkify
 
 from flask import g, redirect, request, Markup, abort, flash, escape
-from sqlalchemy import or_
 from coaster.utils import make_name
 from coaster.views import ModelView, UrlChangeCheck, UrlForView, jsonp, render_with, requires_permission, route
 from coaster.auth import current_auth
@@ -12,8 +11,10 @@
 from baseframe.forms import render_form, render_delete_sqla, Form
 
 from .. import app, funnelapp, lastuser
-from ..models import db, Section, Proposal, Comment
-from ..forms import ProposalForm, CommentForm, DeleteCommentForm, ProposalTransitionForm, ProposalMoveForm
+from ..models import db, Proposal, Comment
+from ..forms import (ProposalForm, CommentForm, DeleteCommentForm,
+    ProposalTransitionForm, ProposalMoveForm,
+    ProposalLabelsAdminForm)
 from .mixins import ProjectViewMixin, ProposalViewMixin
 from .decorators import legacy_redirect
 
@@ -94,24 +95,15 @@ class BaseProjectProposalView(ProjectViewMixin, UrlChangeCheck, UrlForView, Mode
     @requires_permission('new-proposal')
     def new_proposal(self):
         form = ProposalForm(model=Proposal, parent=self.obj)
-        del form.session_type  # We don't use this anymore
-        if self.obj.inherit_sections:
-            form.section.query = Section.query.filter(or_(Section.project == self.obj, Section.project == self.obj.parent_project), Section.public == True).order_by('title')  # NOQA
-        else:
-            form.section.query = Section.query.filter(Section.project == self.obj, Section.public == True).order_by('title')  # NOQA
-        if not list(form.section.query.all()):
-            # Don't bother with sections when there aren't any
-            del form.section
         if request.method == 'GET':
             form.email.data = g.user.email
             form.phone.data = g.user.phone
         if form.validate_on_submit():
             proposal = Proposal(user=current_auth.user, project=self.obj)
-            with db.session.no_autoflush:
-                proposal.voteset.vote(g.user)  # Vote up your own proposal by default
-            form.populate_obj(proposal.formdata)
+            form.populate_obj(proposal)
             proposal.name = make_name(proposal.title)
             db.session.add(proposal)
+            proposal.voteset.vote(g.user)  # Vote up your own proposal by default
             db.session.commit()
             flash(_("Your new session has been saved"), 'info')
             return redirect(proposal.url_for(), code=303)
@@ -160,11 +152,14 @@ def view(self):
         if 'move_to' in self.obj.current_access():
             proposal_move_form = ProposalMoveForm()
 
+        proposal_label_admin_form = ProposalLabelsAdminForm(model=Proposal, obj=self.obj, parent=self.obj.project)
+
         return dict(project=self.obj.project, proposal=self.obj,
             comments=comments, commentform=commentform, delcommentform=delcommentform,
             links=links, transition_form=transition_form, proposal_move_form=proposal_move_form,
             part_a=self.obj.project.proposal_part_a.get('title', 'Objective'),
-            part_b=self.obj.project.proposal_part_b.get('title', 'Description'), csrf_form=Form())
+            part_b=self.obj.project.proposal_part_b.get('title', 'Description'), csrf_form=Form(),
+            proposal_label_admin_form=proposal_label_admin_form)
 
     @route('json')
     @requires_permission('view')
@@ -173,22 +168,13 @@ def json(self):
 
     @route('edit', methods=['GET', 'POST'])
     @lastuser.requires_login
-    @requires_permission('edit-proposal')
+    @requires_permission('edit_proposal')
     def edit(self):
-        form = ProposalForm(obj=self.obj.formdata, model=Proposal, parent=self.obj.project)
-        if not self.obj.session_type:
-            del form.session_type  # Remove this if we're editing a proposal that had no session type
-        if self.obj.project.inherit_sections:
-            form.section.query = Section.query.filter(or_(Section.project == self.obj.project, Section.project == self.obj.project.parent_project), Section.public == True).order_by('title')  # NOQA
-        else:
-            form.section.query = Section.query.filter(Section.project == self.obj.project, Section.public == True).order_by('title')  # NOQA
-        if not list(form.section.query.all()):
-            # Don't bother with sections when there aren't any
-            del form.section
+        form = ProposalForm(obj=self.obj, model=Proposal, parent=self.obj.project)
         if self.obj.user != g.user:
             del form.speaking
         if form.validate_on_submit():
-            form.populate_obj(self.obj.formdata)
+            form.populate_obj(self.obj)
             self.obj.name = make_name(self.obj.title)
             self.obj.edited_at = datetime.utcnow()
             db.session.commit()
@@ -267,6 +253,21 @@ def schedule(self):
         from .session import session_form
         return session_form(self.obj.project, proposal=self.obj)
 
+    @route('labels', methods=['GET', 'POST'])
+    @lastuser.requires_login
+    @requires_permission('admin')
+    def edit_labels(self):
+        form = ProposalLabelsAdminForm(model=Proposal, obj=self.obj, parent=self.obj.project)
+        if form.validate_on_submit():
+            form.populate_obj(self.obj)
+            db.session.commit()
+            flash(_("Labels have been saved for this proposal."), 'info')
+            return redirect(self.obj.url_for(), 303)
+        else:
+            flash(_("Labels could not be saved for this proposal."), 'error')
+            return render_form(form, submit=_("Save changes"),
+                title=_("Edit labels for '{}'").format(self.obj.title))
+
 
 @route('/<project>/<url_id_name>', subdomain='<profile>')
 class FunnelProposalView(ProposalView):
diff --git a/instance/testing.py b/instance/testing.py
index 11900fa27..d2f09c1ee 100644
--- a/instance/testing.py
+++ b/instance/testing.py
@@ -1,10 +1,18 @@
 SECRET_KEY = 'testkey'
-SQLALCHEMY_DATABASE_URI = 'postgresql://127.0.0.1/funnel_testing'
+SQLALCHEMY_DATABASE_URI = 'postgresql:///funnel_testing'
 SERVER_NAME = 'funnel.travis.local:3000'
 STATIC_SUBDOMAIN = 'static'
 LASTUSER_SERVER = 'https://auth.hasgeek.com'
 LASTUSER_CLIENT_ID = ''
 LASTUSER_CLIENT_SECRET = ''
-
+LASTUSER_USE_SESSIONS = False
+UPLOAD_FOLDER = '/tmp'
 TIMEZONE = 'Asia/Kolkata'
 RQ_LOW_URL = 'redis://localhost:6379/0'
+ASSET_BASE_PATH = "build"
+HASCORE_SERVER = 'https://api.hasgeek.com'
+WTF_CSRF_ENABLED = False
+WTF_CSRF_METHODS = {}
+
+ASSET_MANIFEST_PATH = "static/build/manifest.json"
+ASSET_BASE_PATH = "build"
diff --git a/migrations/versions/0b25df40d307_add_labels.py b/migrations/versions/0b25df40d307_add_labels.py
new file mode 100644
index 000000000..eea345926
--- /dev/null
+++ b/migrations/versions/0b25df40d307_add_labels.py
@@ -0,0 +1,51 @@
+"""add labels
+
+# Revision ID: 0b25df40d307
+# Revises: ef93d256a8cf
+Create Date: 2019-04-08 14:44:05.164533
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '0b25df40d307'
+down_revision = 'ef93d256a8cf'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.create_table('label',
+        sa.Column('created_at', sa.DateTime(), nullable=False),
+        sa.Column('updated_at', sa.DateTime(), nullable=False),
+        sa.Column('project_id', sa.Integer(), nullable=False),
+        sa.Column('main_label_id', sa.Integer(), nullable=True),
+        sa.Column('seq', sa.Integer(), nullable=False),
+        sa.Column('description', sa.UnicodeText(), nullable=False),
+        sa.Column('icon_emoji', sa.UnicodeText(), nullable=True),
+        sa.Column('archived', sa.Boolean(), nullable=False),
+        sa.Column('restricted', sa.Boolean(), nullable=False),
+        sa.Column('required', sa.Boolean(), nullable=False),
+        sa.Column('name', sa.Unicode(length=250), nullable=False),
+        sa.Column('title', sa.Unicode(length=250), nullable=False),
+        sa.Column('id', sa.Integer(), nullable=False),
+        sa.ForeignKeyConstraint(['main_label_id'], ['label.id'], ondelete='CASCADE'),
+        sa.ForeignKeyConstraint(['project_id'], ['project.id'], ondelete='CASCADE'),
+        sa.PrimaryKeyConstraint('id'),
+        sa.UniqueConstraint('project_id', 'name')
+    )
+    op.create_table('proposal_label',
+        sa.Column('proposal_id', sa.Integer(), nullable=False),
+        sa.Column('label_id', sa.Integer(), nullable=False),
+        sa.Column('created_at', sa.DateTime(), nullable=True),
+        sa.ForeignKeyConstraint(['label_id'], ['label.id'], ondelete='CASCADE'),
+        sa.ForeignKeyConstraint(['proposal_id'], ['proposal.id'], ondelete='CASCADE'),
+        sa.PrimaryKeyConstraint('proposal_id', 'label_id')
+    )
+    op.create_index(op.f('ix_proposal_label_label_id'), 'proposal_label', ['label_id'], unique=False)
+
+
+def downgrade():
+    op.drop_index(op.f('ix_proposal_label_label_id'), table_name='proposal_label')
+    op.drop_table('proposal_label')
+    op.drop_table('label')
diff --git a/migrations/versions/e2be4ab896d3_migrate_old_labels.py b/migrations/versions/e2be4ab896d3_migrate_old_labels.py
new file mode 100644
index 000000000..7f84c7c40
--- /dev/null
+++ b/migrations/versions/e2be4ab896d3_migrate_old_labels.py
@@ -0,0 +1,158 @@
+"""migrate old labels
+
+Revision ID: e2be4ab896d3
+Revises: 0b25df40d307
+Create Date: 2019-04-22 12:50:31.062089
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'e2be4ab896d3'
+down_revision = '0b25df40d307'
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.sql import table, column
+
+
+proposal = table('proposal',
+    column('id', sa.Integer()),
+    column('project_id', sa.Integer()),
+    column('technical_level', sa.Unicode(40)),
+    column('session_type', sa.Unicode(40)),
+    column('section_id', sa.Integer()),
+)
+
+project = table('project',
+    column('id', sa.Integer()),
+    column('name', sa.Unicode(250))
+)
+
+section = table('section',
+    column('id', sa.Integer()),
+    column('project_id', sa.Integer()),
+    column('name', sa.Unicode(250)),
+    column('title', sa.Unicode(250)),
+    column('description', sa.UnicodeText()),
+    column('created_at', sa.DateTime()),
+    column('updated_at', sa.DateTime())
+)
+
+label = table('label',
+    column('id', sa.Integer()),
+    column('name', sa.Unicode(250)),
+    column('title', sa.Unicode(250)),
+    column('description', sa.UnicodeText()),
+    column('icon_emoji', sa.UnicodeText()),
+    column('project_id', sa.Integer()),
+    column('main_label_id', sa.Integer()),
+    column('seq', sa.Integer()),
+    column('restricted', sa.Boolean()),
+    column('required', sa.Boolean()),
+    column('archived', sa.Boolean()),
+    column('created_at', sa.DateTime()),
+    column('updated_at', sa.DateTime())
+)
+
+proposal_label = table('proposal_label',
+    column('proposal_id', sa.Integer()),
+    column('label_id', sa.Integer()),
+    column('created_at', sa.DateTime())
+)
+
+
+def upgrade():
+    conn = op.get_bind()
+    # Migrate sections -
+    projects = conn.execute(project.select())
+    for proj in projects:
+        sec_count = conn.scalar(
+            sa.select([sa.func.count('*')]).select_from(section).where(section.c.project_id == proj['id'])
+        )
+        if sec_count > 0:
+            # the project has some sections
+            # create section labelset for the project
+            sections_label = conn.execute(label.insert().values({
+                'project_id': proj['id'], 'name': u"section", 'title': u"Section",
+                'seq': 1, 'description': u"", 'restricted': False, 'archived': False,
+                'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
+            }).returning(label.c.id)).first()
+
+            sections = conn.execute(section.select().where(section.c.project_id == proj['id']))
+            for index, sec in enumerate(sections, start=1):
+                lab = conn.execute(label.insert().values({
+                    'main_label_id': sections_label[0],
+                    'project_id': proj['id'], 'name': sec['name'], 'title': sec['title'],
+                    'seq': index, 'description': u"", 'restricted': False, 'archived': False,
+                    'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
+                }).returning(label.c.id, label.c.name)).first()
+
+                # FIXME: This will miss proposals in a project linked to sections in another project
+                # -- an error condition resulting from proposals that have been moved around
+                proposals = conn.execute(
+                    proposal.select().where(proposal.c.section_id == sec['id']).where(proposal.c.project_id == sec['project_id'])
+                )
+                for prop in proposals:
+                    conn.execute(proposal_label.insert().values({
+                        'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': sa.func.now()
+                    }))
+
+        # technical level
+        techlevel_label = conn.execute(label.insert().values({
+            'project_id': proj['id'], 'name': u"technical-level", 'title': u"Technical level",
+            'seq': 2, 'description': u"", 'restricted': False, 'archived': False,
+            'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
+        }).returning(label.c.id)).first()
+        tl_list = [(u'beginner', u"Beginner"), (u'intermediate', u"Intermediate"), (u'advanced', u"Advanced")]
+        for index, tl in enumerate(tl_list, start=1):
+            tl_name, tl_title = tl
+            lab = conn.execute(label.insert().values({
+                'project_id': proj['id'], 'name': tl_name, 'title': tl_title, 'main_label_id': techlevel_label[0],
+                'seq': index, 'description': u"", 'restricted': False, 'archived': False,
+                'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
+            }).returning(label.c.id, label.c.name)).first()
+
+            proposals = conn.execute(
+                proposal.select().where(proposal.c.project_id == proj['id']).where(proposal.c.technical_level == tl_title)
+            )
+            for prop in proposals:
+                conn.execute(proposal_label.insert().values({
+                    'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': sa.func.now()
+                }))
+
+        # session type
+        sessiontype_label = conn.execute(label.insert().values({
+            'project_id': proj['id'], 'name': u"session-type", 'title': u"Session type",
+            'seq': 3, 'description': u"", 'restricted': False, 'archived': False,
+            'required': False, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
+        }).returning(label.c.id)).first()
+
+        st_list = [(u'lecture', u"Lecture"), (u'demo', u"Demo"), (u'tutorial', u"Tutorial"),
+            (u'workshop', u"Workshop"), (u'discussion', u"Discussion"), (u'panel', u"Panel")]
+
+        for index, st in enumerate(st_list, start=1):
+            st_name, st_title = st
+            duplicate_count = conn.scalar(
+                sa.select([sa.func.count('*')]).select_from(label).where(label.c.name == st_name).where(label.c.project_id == proj['id'])
+            )
+            if duplicate_count > 0:
+                st_name = st_name + "2"
+            lab = conn.execute(label.insert().values({
+                'project_id': proj['id'], 'name': st_name, 'title': st_title, 'main_label_id': sessiontype_label[0],
+                'seq': index, 'description': u"", 'restricted': False, 'archived': False,
+                'required': True, 'created_at': sa.func.now(), 'updated_at': sa.func.now()
+            }).returning(label.c.id, label.c.name)).first()
+
+            proposals = conn.execute(
+                proposal.select().where(proposal.c.project_id == proj['id']).where(proposal.c.session_type == st_title)
+            )
+            for prop in proposals:
+                conn.execute(proposal_label.insert().values({
+                    'proposal_id': prop['id'], 'label_id': lab['id'], 'created_at': sa.func.now()
+                }))
+
+
+def downgrade():
+    conn = op.get_bind()
+    conn.execute(label.delete())
+    conn.execute(proposal_label.delete())
diff --git a/runtests.sh b/runtests.sh
index 3bbd3747c..594fb3abc 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 set -e
+export PYTHONIOENCODING="UTF-8"
 export FLASK_ENV="TESTING"
 coverage run -m pytest "$@"
 coverage report -m
diff --git a/tests/conftest.py b/tests/conftest.py
index 19be0d7d3..481b78cec 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,18 +1,46 @@
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
 import pytest
-from funnel import app as hasgeekapp, db
-from funnel.models import Profile, Project, User
+import uuid
+from funnel import app
+from funnel.models import db, Profile, Project, User, Label, Proposal, Team
+
+
+@app.route('/usertest')
+def user_test():
+    from coaster.auth import current_auth
+    return current_auth.user.username if current_auth.user is not None else "<anon>"
+
+
+TEST_DATA = {
+    'users': {
+        'testuser': {
+            'username': u"testuser",
+            'email': u"testuser@example.com",
+        },
+        'testuser2': {
+            'username': u"testuser2",
+            'email': u"testuser2@example.com",
+        },
+        'testuser3': {
+            'username': u"testuser3",
+            'email': u"testuser3@example.com",
+        },
+    }
+}
+# Scope: session
+# These fixtures are run before every test session
 
 
 @pytest.fixture(scope='session')
 def test_client():
-    flask_app = hasgeekapp
-
     # Flask provides a way to test your application by exposing the Werkzeug test Client
     # and handling the context locals for you.
-    testing_client = flask_app.test_client()
+    testing_client = app.test_client()
 
     # Establish an application context before running the tests.
-    ctx = flask_app.app_context()
+    ctx = app.app_context()
     ctx.push()
 
     yield testing_client  # this is where the testing happens!
@@ -22,38 +50,135 @@ def test_client():
 
 
 @pytest.fixture(scope='session')
-def test_db():
+def test_db(test_client):
     # Create the database and the database table
     db.create_all()
 
     yield db  # this is where the testing happens!
 
+    # anything after yield is teardown code
     db.session.rollback()
     db.session.remove()
     db.drop_all()
 
 
-@pytest.fixture(scope='module')
+@pytest.fixture(scope='session')
 def new_user(test_db):
-    user = User(username=u"testuser", email=u"test@example.com")
+    user = User(**TEST_DATA['users']['testuser'])
     test_db.session.add(user)
     test_db.session.commit()
     return user
 
 
-@pytest.fixture(scope='module')
-def new_profile(test_db):
-    profile = Profile(title=u"Test Profile", description=u"Test Description")
+@pytest.fixture(scope='session')
+def new_user2(test_db):
+    user = User(**TEST_DATA['users']['testuser2'])
+    test_db.session.add(user)
+    test_db.session.commit()
+    return user
+
+
+@pytest.fixture(scope='session')
+def new_user3(test_db):
+    user = User(**TEST_DATA['users']['testuser3'])
+    test_db.session.add(user)
+    test_db.session.commit()
+    return user
+
+
+@pytest.fixture(scope='session')
+def new_team(test_db, new_user):
+    team = Team(title=u"Owners", owners=True, org_uuid=uuid.uuid4())
+    test_db.session.add(team)
+    team.users.append(new_user)
+    test_db.session.commit()
+    return team
+
+
+@pytest.fixture(scope='session')
+def new_profile(test_db, new_team):
+    profile = Profile(title=u"Test Profile", description=u"Test Description",
+    admin_team=new_team)
     test_db.session.add(profile)
     test_db.session.commit()
     return profile
 
 
-@pytest.fixture(scope='module')
-def new_project(test_db, new_profile, new_user):
+@pytest.fixture(scope='session')
+def new_project(test_db, new_profile, new_user, new_team):
     project = Project(
         profile=new_profile, user=new_user, title=u"Test Project",
-        tagline=u"Test tagline", description=u"Test description")
+        tagline=u"Test tagline", description=u"Test description",
+        admin_team=new_team, review_team=new_team, checkin_team=new_team)
     test_db.session.add(project)
     test_db.session.commit()
     return project
+
+
+@pytest.fixture(scope='class')
+def new_main_label(test_db, new_project):
+    main_label_a = Label(
+        title=u"Parent Label A", project=new_project,
+        description=u"A test parent label"
+    )
+    new_project.labels.append(main_label_a)
+    test_db.session.add(main_label_a)
+
+    label_a1 = Label(title=u"Label A1", icon_emoji=u"👍", project=new_project)
+    test_db.session.add(label_a1)
+
+    label_a2 = Label(title=u"Label A2", project=new_project)
+    test_db.session.add(label_a2)
+
+    main_label_a.options.append(label_a1)
+    main_label_a.options.append(label_a2)
+    main_label_a.required = True
+    main_label_a.restricted = True
+    test_db.session.commit()
+
+    return main_label_a
+
+
+@pytest.fixture(scope='class')
+def new_main_label_unrestricted(test_db, new_project):
+    main_label_b = Label(
+        title=u"Parent Label B", project=new_project,
+        description=u"A test parent label"
+    )
+    new_project.labels.append(main_label_b)
+    test_db.session.add(main_label_b)
+
+    label_b1 = Label(title=u"Label B1", icon_emoji=u"👍", project=new_project)
+    test_db.session.add(label_b1)
+
+    label_b2 = Label(title=u"Label B2", project=new_project)
+    test_db.session.add(label_b2)
+
+    main_label_b.options.append(label_b1)
+    main_label_b.options.append(label_b2)
+    main_label_b.required = False
+    main_label_b.restricted = False
+    test_db.session.commit()
+
+    return main_label_b
+
+
+@pytest.fixture(scope='class')
+def new_label(test_db, new_project):
+    label_b = Label(title=u"Label B", icon_emoji=u"🔟", project=new_project)
+    new_project.labels.append(label_b)
+    test_db.session.add(label_b)
+    test_db.session.commit()
+    return label_b
+
+
+@pytest.fixture(scope='class')
+def new_proposal(test_db, new_user, new_project):
+    proposal = Proposal(
+        user=new_user, speaker=new_user, project=new_project,
+        title=u"Test Proposal", description=u"Test proposal description",
+        location=u"Bangalore"
+    )
+    test_db.session.add(proposal)
+    test_db.session.commit()
+    return proposal
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/integration/views/__init__.py b/tests/integration/views/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/integration/views/test_label_views.py b/tests/integration/views/test_label_views.py
new file mode 100644
index 000000000..f17016971
--- /dev/null
+++ b/tests/integration/views/test_label_views.py
@@ -0,0 +1,179 @@
+# -*- coding: utf-8 -*-
+
+from werkzeug.datastructures import MultiDict
+from funnel.models import Label
+
+
+class TestLabelViews(object):
+    def test_manage_labels_view(self, test_client, test_db, new_project, new_user, new_label, new_main_label):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            resp = c.get(new_project.url_for('labels'))
+            assert u"Manage labels" in resp.data.decode('utf-8')
+            assert new_label.title in resp.data.decode('utf-8')
+            assert new_main_label.title in resp.data.decode('utf-8')
+
+    def test_labels_order_view(self, test_client, test_db, new_project, new_user, new_label, new_main_label):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            assert new_label.seq == 1
+            assert new_main_label.seq == 2
+
+            # we'll send the label names in reverse order and that should
+            # reorder them in the project
+            resp = c.post(new_project.url_for('labels'), data=MultiDict({
+                    'name': [new_main_label.name, new_label.name]
+                }), follow_redirects=True)
+
+            # make sure the page loaded properly
+            assert u"Manage labels" in resp.data.decode('utf-8')
+            assert new_label.title in resp.data.decode('utf-8')
+            assert new_main_label.title in resp.data.decode('utf-8')
+
+            # make sure the reoder took place
+            assert new_label.seq == 2
+            assert new_main_label.seq == 1
+
+    def test_new_label_view(self, test_client, test_db, new_project, new_user):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            resp = c.post(new_project.url_for('new_label'), data=MultiDict({
+                'title': ["New Main Label", "New Option A", "New Option B"],
+                'icon_emoji': [u"💯", u"", u""],
+            }), follow_redirects=True)
+
+            mlabel = Label.query.filter_by(project=new_project, title=u"New Main Label").first()
+            assert mlabel is not None
+            assert mlabel.icon == u"💯"
+            assert mlabel.has_options
+            assert mlabel.is_main_label
+            assert mlabel.main_label is None
+            assert len(mlabel.options) == 2
+
+            assert mlabel.options[0].title == "New Option A"
+            assert mlabel.options[0].seq == 1
+            assert mlabel.options[1].title == "New Option B"
+            assert mlabel.options[1].seq == 2
+
+            # make sure the page loaded properly
+            assert u"Manage labels" in resp.data.decode('utf-8')
+            assert mlabel.title in resp.data.decode('utf-8')
+
+    def test_edit_option_label_view(self, test_client, test_db, new_project, new_user, new_main_label):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            opt_label = new_main_label.options[0]
+            resp = c.post(opt_label.url_for('edit'), follow_redirects=True)
+            assert u"Manage labels" in resp.data.decode('utf-8')
+            assert u"Only main labels can be edited" in resp.data.decode('utf-8')
+
+
+    def test_edit_main_label_view(self, test_client, test_db, new_project, new_user, new_main_label):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            assert new_main_label.title == u"Parent Label A"
+            assert new_main_label.name == u"parent-label-a"
+            assert new_main_label.icon_emoji is None
+
+            label_a1 = new_main_label.options[0]
+            label_a2 = new_main_label.options[1]
+
+            assert label_a1.title == u"Label A1"
+            assert label_a1.name == u"label-a1"
+            assert label_a2.title == u"Label A2"
+            assert label_a2.name == u"label-a2"
+
+            resp = c.post(new_main_label.url_for('edit'), data=MultiDict({
+                'name': ["parent-label-a", "label-a1", "label-a2"],
+                'title': ["Parent Label A Edited", "Label A1 Edited", "Label A2 Edited"],
+                'icon_emoji': [u"🔟", u"👍", u"❌"]
+            }), follow_redirects=True)
+            assert u"Manage labels" in resp.data.decode('utf-8')
+            assert u"Label has been edited" in resp.data.decode('utf-8')
+
+            assert new_main_label.title == u"Parent Label A Edited"
+            assert new_main_label.name == u"parent-label-a"
+            assert new_main_label.icon_emoji == u"🔟"
+
+            assert label_a1.title == u"Label A1 Edited"
+            assert label_a1.name == u"label-a1"
+            assert label_a1.icon == u"👍"
+            assert label_a2.title == u"Label A2 Edited"
+            assert label_a2.name == u"label-a2"
+            assert label_a2.icon == u"❌"
+
+
+class TestLabelArchiveView(object):
+    def test_label_archive(self, test_client, test_db, new_user, new_label):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            resp = c.post(new_label.url_for('archive'), follow_redirects=True)
+            label = Label.query.get(new_label.id)
+            assert u"Manage labels" in resp.data.decode('utf-8')
+            assert u"The label has been archived" in resp.data.decode('utf-8')
+            assert label.archived is True
+
+
+class TestLabelDeleteView(object):
+    """
+    Separate class because the ``new_label`` fixture has a class scope.
+    If we delete it in any other test classes, it'll mess with other
+    tests in those classes.
+    """
+    def test_main_label_delete(self, test_client, test_db, new_user, new_label):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            resp = c.post(new_label.url_for('delete'), follow_redirects=True)
+            assert u"Manage labels" in resp.data.decode('utf-8')
+            assert u"The label has been deleted" in resp.data.decode('utf-8')
+            label = Label.query.get(new_label.id)
+            assert label is None
+
+    def test_option_label_delete(self, test_client, test_db, new_user, new_main_label):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            label_a1 = new_main_label.options[0]
+            label_a2 = new_main_label.options[1]
+
+            assert label_a1.title == u"Label A1"
+            assert label_a1.seq == 1
+            assert label_a2.title == u"Label A2"
+            assert label_a2.seq == 2
+
+            # let's delete A1
+            resp = c.post(label_a1.url_for('delete'), follow_redirects=True)
+            assert u"Manage labels" in resp.data.decode('utf-8')
+            assert u"The label has been deleted" in resp.data.decode('utf-8')
+            label = Label.query.get(label_a1.id)
+            assert label is None
+
+            # as A1 is deleted, A2's sequence should change to 1
+            assert label_a2.seq == 1
+
+
+class TestOptionedLabelDeleteView(object):
+    def test_optioned_label_delete(self, test_client, test_db, new_user, new_main_label):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            label_a1 = new_main_label.options[0]
+            label_a2 = new_main_label.options[1]
+
+            # let's delete the main optioned label
+            resp = c.post(new_main_label.url_for('delete'), follow_redirects=True)
+            assert u"Manage labels" in resp.data.decode('utf-8')
+            assert u"The label has been deleted" in resp.data.decode('utf-8')
+            mlabel = Label.query.get(new_main_label.id)
+            assert mlabel is None
+
+            # so the option labels should have been deleted as well
+            for olabel in [label_a1, label_a2]:
+                assert Label.query.get(olabel.id) is None
diff --git a/tests/integration/views/test_project_views.py b/tests/integration/views/test_project_views.py
new file mode 100644
index 000000000..a0e3c2d3d
--- /dev/null
+++ b/tests/integration/views/test_project_views.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+
+from werkzeug.datastructures import MultiDict
+from funnel.models import Label
+from funnel.forms import LabelForm
+
+
+class TestProjectViews(object):
+    def test_new_label_get(self, test_client, new_user, new_project):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            resp = c.get(new_project.url_for('new_label'))
+            label_form = LabelForm(parent=new_project, model=Label)
+            for field in label_form:
+                assert field.name in resp.data
+
+    def test_new_label_without_option(self, test_client, new_user, new_project):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            resp_post = c.post(new_project.url_for('new_label'), data=MultiDict({
+                'title': u"Label V1", 'icon_emoji': u"👍",
+                'required': False, 'restricted': False
+            }), follow_redirects=True)
+            assert u"Manage labels" in resp_post.data.decode('utf-8')
+            label_v1 = Label.query.filter_by(title=u"Label V1", icon_emoji=u"👍", project=new_project).first()
+            assert label_v1 is not None
+
+    def test_new_label_with_option(self, test_client, new_user, new_project):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            resp_post = c.post(new_project.url_for('new_label'), data=MultiDict({
+                'title': [u"Label V2", "Option V21", "Option V22"], 'icon_emoji': [u"👍", "", ""],
+                'required': False, 'restricted': False
+            }), follow_redirects=True)
+            assert u"Manage labels" in resp_post.data.decode('utf-8')
+            label_v2 = Label.query.filter_by(title=u"Label V2", icon_emoji=u"👍", project=new_project).first()
+            assert label_v2 is not None
+            assert label_v2.has_options
+            assert len(label_v2.options) == 2
+
+            assert label_v2.options[0].title == "Option V21"
+            assert label_v2.options[0].icon_emoji == ""
+            assert label_v2.options[0].icon == "OV"
+
+            assert label_v2.options[1].title == "Option V22"
+            assert label_v2.options[1].icon_emoji == ""
+            assert label_v2.options[1].icon == "OV"
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 0b040585e..3323c409f 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -1,15 +1,29 @@
 # -*- coding: utf-8 -*-
-import unittest
-from funnel.util import extract_twitter_handle
+from flask import current_app
+from funnel.util import (extract_twitter_handle, geonameid_from_location,
+    split_name, format_twitter_handle)
 
 
-class TestUtils(unittest.TestCase):
+class TestUtils(object):
     def test_extract_twitter_handle(self):
         expected = u'shreyas_satish'
-        self.assertEquals(extract_twitter_handle('https://twitter.com/shreyas_satish'), expected)
-        self.assertEquals(extract_twitter_handle('https://twitter.com/shreyas_satish/favorites'), expected)
-        self.assertEquals(extract_twitter_handle('@shreyas_satish'), expected)
-        self.assertEquals(extract_twitter_handle('shreyas_satish'), expected)
-        self.assertEquals(extract_twitter_handle('seriouslylongstring'), None)
-        self.assertEquals(extract_twitter_handle('https://facebook.com/shreyas'), None)
-        self.assertEquals(extract_twitter_handle(''), None)
+        assert extract_twitter_handle('https://twitter.com/shreyas_satish') == expected
+        assert extract_twitter_handle('https://twitter.com/shreyas_satish/favorites') == expected
+        assert extract_twitter_handle('@shreyas_satish') == expected
+        assert extract_twitter_handle('shreyas_satish') == expected
+        assert extract_twitter_handle('seriouslylongstring') is None
+        assert extract_twitter_handle('https://facebook.com/shreyas') is None
+        assert extract_twitter_handle('') is None
+
+    def test_geonameid_from_location(self, test_client):
+        with current_app.test_request_context('/'):
+            location = "Bangalore"
+            expected_geonameid = 1277333
+            assert expected_geonameid in geonameid_from_location(location)
+
+    def test_split_name(self):
+        assert split_name("ABC DEF EFG") == ("ABC", "DEF EFG")
+        assert split_name("") == ""
+
+    def test_format_twitter_handle(self):
+        assert format_twitter_handle("testusername") == "@testusername"
diff --git a/tests/unit/forms/__init__.py b/tests/unit/forms/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/unit/forms/test_label_forms.py b/tests/unit/forms/test_label_forms.py
new file mode 100644
index 000000000..04af0460a
--- /dev/null
+++ b/tests/unit/forms/test_label_forms.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+from flask import current_app
+from werkzeug.datastructures import MultiDict
+from funnel.forms import LabelForm
+
+
+class TestLabelForms(object):
+    def test_label_form(self, test_client):
+        with current_app.test_request_context('/'):
+            form = LabelForm(MultiDict({
+                'title': u"Test label title",
+                'icon_emoji': u"🔟",
+                'required': False,
+                'restricted': False
+            }), meta={'csrf': False})
+            assert form.validate()
+
+    def test_label_form_invalid(self, test_client):
+        with current_app.test_request_context('/'):
+            form = LabelForm(MultiDict({
+                'icon_emoji': u"🔟",
+                'required': False,
+                'restricted': False
+            }), meta={'csrf': False})
+            # title is required
+            assert not form.validate()
diff --git a/tests/unit/forms/test_proposal_forms.py b/tests/unit/forms/test_proposal_forms.py
new file mode 100644
index 000000000..d03cbbdcd
--- /dev/null
+++ b/tests/unit/forms/test_proposal_forms.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+
+from flask import current_app
+from funnel.forms import ProposalLabelsForm, ProposalLabelsAdminForm
+from funnel.models import Proposal
+
+
+class TestProposalForm(object):
+    def test_proposal_label_admin_form(self, test_client, test_db, new_main_label, new_main_label_unrestricted, new_label, new_proposal):
+        with current_app.test_request_context('/'):
+            assert new_main_label.restricted
+            assert not new_main_label_unrestricted.restricted
+            assert not new_label.restricted
+            assert not new_label.has_options
+
+            label_admin_form = ProposalLabelsAdminForm(obj=new_proposal, model=Proposal, parent=new_proposal.project)
+            # Label form in admin panel shows restricted and optioned labels
+            assert hasattr(label_admin_form.formlabels, new_main_label.name)
+            # Label form in admin panel doesn't show unrestricted labels
+            assert not hasattr(label_admin_form.formlabels, new_main_label_unrestricted.name)
+            # Label form in admin panel shows non-optioned labels
+            assert hasattr(label_admin_form.formlabels, new_label.name)
+            # test the field label text and id
+            assert getattr(label_admin_form.formlabels, new_label.name).label.text == new_label.form_label_text
+            assert getattr(label_admin_form.formlabels, new_label.name).label.field_id == new_label.name
+
+    def test_proposal_label_form(self, test_client, test_db, new_main_label, new_main_label_unrestricted, new_label, new_proposal):
+        with current_app.test_request_context('/'):
+            assert new_main_label.restricted
+            assert not new_main_label_unrestricted.restricted
+            assert not new_label.restricted
+            assert not new_label.has_options
+
+            label_form = ProposalLabelsForm(obj=new_proposal, model=Proposal, parent=new_proposal.project)
+            # Label form in edit page doesn't show restricted labels
+            assert not hasattr(label_form.formlabels, new_main_label.name)
+            # Label form in edit page shows non-restricted optioned labels
+            assert hasattr(label_form.formlabels, new_main_label_unrestricted.name)
+            # Label form in edit page doesn't show non-optioned labels
+            assert not hasattr(label_form.formlabels, new_label.name)
diff --git a/tests/unit/models/test_label.py b/tests/unit/models/test_label.py
new file mode 100644
index 000000000..951f533ea
--- /dev/null
+++ b/tests/unit/models/test_label.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+
+import pytest
+from funnel.models import Label
+
+
+class TestLabels(object):
+    def test_main_label_from_fixture(self, test_client, new_main_label):
+        assert new_main_label.title == u"Parent Label A"
+        assert new_main_label.has_options
+        assert new_main_label.required
+        assert new_main_label.restricted
+        assert not new_main_label.archived
+        assert len(new_main_label.options) > 0
+
+    def test_child_label_from_fixture(self, test_client, test_db, new_main_label):
+        assert len(new_main_label.options) > 0
+        label_a1 = new_main_label.options[0]
+        assert label_a1.title == u"Label A1"
+        assert label_a1.icon_emoji == u"👍"
+        assert label_a1.icon == u"👍"
+        assert not label_a1.has_options
+
+        with pytest.raises(ValueError):
+            # because Label A1 is not a main and optioned label,
+            # it's restricted flag cannot be set
+            label_a1.restricted = True
+
+    def test_label_from_fixture(self, test_client, test_db, new_label):
+        assert new_label.title == u"Label B"
+        assert new_label.icon_emoji == u"🔟"
+        assert new_label.icon == u"🔟"
+        assert not new_label.has_options
+
+        with pytest.raises(ValueError):
+            # because Label B is not a parent label, it cannot be required
+            new_label.required = True
+
+    def test_proposal_assignment_radio(self, test_client, test_db, new_main_label, new_proposal):
+        # Parent labels are always in radio mode
+        label_a1 = new_main_label.options[0]
+        label_a2 = new_main_label.options[1]
+        label_a1.apply_to(new_proposal)
+        assert label_a1 in new_proposal.labels
+
+        label_a2.apply_to(new_proposal)
+        # because new_main_label is in radio mode,
+        # label_a2 will replace label_a1
+        assert label_a1 not in new_proposal.labels
+        assert label_a2 in new_proposal.labels
+
+    def test_label_flags(self, new_main_label, new_label):
+        restricted_labels = Label.query.filter(Label.restricted == True).all()  # NOQA
+        assert new_main_label in restricted_labels
+        assert new_label not in restricted_labels
+
+    def test_label_icon(self, test_client, test_db, new_label):
+        # if the label has icon_emoji, that's get set as icon
+        assert new_label.icon == new_label.icon_emoji
+        new_label.icon_emoji = ""
+        test_db.session.commit()
+        assert new_label.title == "Label B"
+        assert new_label.icon == "LB"
+
+    def test_label_archived(self, test_client, test_db, new_label):
+        assert new_label.archived is False
+        assert new_label._archived is False
+        new_label.archived = True
+        test_db.session.commit()
+        assert new_label._archived is True
+        assert new_label.archived is True
diff --git a/tests/unit/models/test_profile.py b/tests/unit/models/test_profile.py
index c9b821cbf..1b77d15c8 100644
--- a/tests/unit/models/test_profile.py
+++ b/tests/unit/models/test_profile.py
@@ -1,27 +1,28 @@
+# -*- coding: utf-8 -*-
+
 import pytest
 from furl import furl
 from sqlalchemy.exc import StatementError
 
 
-def test_profile_urltype_valid(test_client, test_db, new_profile):
-    new_profile.logo_url = "https://hasgeek.com"
-    test_db.session.add(new_profile)
-    test_db.session.commit()
-    assert isinstance(new_profile.logo_url, furl)
-    assert new_profile.logo_url.url == "https://hasgeek.com"
-
-
-def test_profile_urltype_invalid(test_client, test_db, new_profile):
-    new_profile.logo_url = "noturl"
-    test_db.session.add(new_profile)
-    with pytest.raises(StatementError):
+class TestProfile(object):
+    def test_profile_urltype_valid(self, test_client, test_db, new_profile):
+        new_profile.logo_url = "https://hasgeek.com"
+        test_db.session.add(new_profile)
         test_db.session.commit()
-    test_db.session.rollback()
+        assert isinstance(new_profile.logo_url, furl)
+        assert new_profile.logo_url.url == "https://hasgeek.com"
 
+    def test_profile_urltype_invalid(self, test_client, test_db, new_profile):
+        new_profile.logo_url = "noturl"
+        test_db.session.add(new_profile)
+        with pytest.raises(StatementError):
+            test_db.session.commit()
+        test_db.session.rollback()
 
-def test_reserved_name(test_client, test_db, new_profile):
-    new_profile.title = "Proposals"
-    new_profile.make_name()
-    # because `proposals` is in reserved name list, `make_name` will
-    # try to generate a name for it starting with suffixing it with 2.
-    assert new_profile.name == "proposals2"
+    def test_reserved_name(self, test_client, test_db, new_profile):
+        new_profile.title = "Proposals"
+        new_profile.make_name()
+        # because `proposals` is in reserved name list, `make_name` will
+        # try to generate a name for it starting with suffixing it with 2.
+        assert new_profile.name == "proposals2"
diff --git a/tests/unit/models/test_project.py b/tests/unit/models/test_project.py
index eb5204a43..37367a7c9 100644
--- a/tests/unit/models/test_project.py
+++ b/tests/unit/models/test_project.py
@@ -1,21 +1,23 @@
-from funnel.models import Project
+# -*- coding: utf-8 -*-
 
+from funnel.models import Project
 
-def test_project_state_conditional(test_client, test_db):
-    past_projects = Project.query.filter(Project.state.PAST).all()
-    assert len(past_projects) >= 0
-    upcoming_projects = Project.query.filter(Project.state.UPCOMING).all()
-    assert len(upcoming_projects) >= 0
 
+class TestProject(object):
+    def test_project_state_conditional(self, test_client, test_db):
+        past_projects = Project.query.filter(Project.state.PAST).all()
+        assert len(past_projects) >= 0
+        upcoming_projects = Project.query.filter(Project.state.UPCOMING).all()
+        assert len(upcoming_projects) >= 0
 
-def test_project_cfp_state_conditional(test_client, test_db):
-    private_draft_cfp_projects = Project.query.filter(Project.cfp_state.PRIVATE_DRAFT).all()
-    assert len(private_draft_cfp_projects) >= 0
-    draft_cfp_projects = Project.query.filter(Project.cfp_state.DRAFT).all()
-    assert len(draft_cfp_projects) >= 0
-    upcoming_cfp_projects = Project.query.filter(Project.cfp_state.UPCOMING).all()
-    assert len(upcoming_cfp_projects) >= 0
-    open_cfp_projects = Project.query.filter(Project.cfp_state.OPEN).all()
-    assert len(open_cfp_projects) >= 0
-    expired_cfp_projects = Project.query.filter(Project.cfp_state.EXPIRED).all()
-    assert len(expired_cfp_projects) >= 0
+    def test_project_cfp_state_conditional(self, test_client, test_db):
+        private_draft_cfp_projects = Project.query.filter(Project.cfp_state.PRIVATE_DRAFT).all()
+        assert len(private_draft_cfp_projects) >= 0
+        draft_cfp_projects = Project.query.filter(Project.cfp_state.DRAFT).all()
+        assert len(draft_cfp_projects) >= 0
+        upcoming_cfp_projects = Project.query.filter(Project.cfp_state.UPCOMING).all()
+        assert len(upcoming_cfp_projects) >= 0
+        open_cfp_projects = Project.query.filter(Project.cfp_state.OPEN).all()
+        assert len(open_cfp_projects) >= 0
+        expired_cfp_projects = Project.query.filter(Project.cfp_state.EXPIRED).all()
+        assert len(expired_cfp_projects) >= 0
diff --git a/tests/unit/models/test_user.py b/tests/unit/models/test_user.py
new file mode 100644
index 000000000..9ec1ee7ba
--- /dev/null
+++ b/tests/unit/models/test_user.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+
+
+class TestUser(object):
+    def test_admin_role(self, test_client, test_db, new_user, new_profile):
+        with test_client.session_transaction() as session:
+            session['lastuser_userid'] = new_user.userid
+        with test_client as c:
+            rv = c.get('/usertest')
+            assert rv.data == new_user.username
+            assert new_profile.current_roles.admin