1. Add remove button
2. Substitute glyphicon to font awesome