WIP - wtf glyphicons? (and adds description field)