glyphicons added
various modifications