Added glyphicons, deleted old templates, updates on templates