Added glyphicons and improved sortable options; TODO - import tool