Fixing view logic assumptions
Fixing bootstrap glyphicon issue