Changed user_settings1 to user_settings and removed vestigial css

web/react/components/activity_log_modal.jsx

@@ -37,7 +37,7 @@ module.exports = React.createClass({
 
         var self = this;
         $(this.refs.modal.getDOMNode()).on('hidden.bs.modal', function(e) {
-            $('#user_settings1').modal('show');
+            $('#user_settings').modal('show');
             self.setState({moreInfo: []});
         });
     },