Refactoring. Replaced remove button with glyphicon