changed the ui
merge changes
fixed glyphicon erros