Improve element rendering, add glyphicon support