Cleaning things up
Add glyphicon support