Get glyphicon-pencil functional, refactor, reorganize