diff --git a/embark-ui/src/components/Block.js b/embark-ui/src/components/Block.js
index 69418a99e..04ab522b1 100644
--- a/embark-ui/src/components/Block.js
+++ b/embark-ui/src/components/Block.js
@@ -13,7 +13,7 @@ const Block = ({block}) => (
           <CardTitleIdenticon id={block.hash}>Block {block.number}</CardTitleIdenticon>
         </CardHeader>
         <CardBody>
-          <dl class="row">
+          <dl className="row">
             <Description label="Hash" value={block.hash} />
             <Description label="Timestamp" value={block.timestamp} />
             <Description label="Difficulty" value={block.difficulty} />
diff --git a/embark-ui/src/components/ContractFunctions.js b/embark-ui/src/components/ContractFunctions.js
deleted file mode 100644
index 8953ce114..000000000
--- a/embark-ui/src/components/ContractFunctions.js
+++ /dev/null
@@ -1,183 +0,0 @@
-import PropTypes from "prop-types";
-import React, {Component} from 'react';
-import {
-  Row,
-  Col,
-  Form,
-  FormGroup,
-  Label,
-  Input,
-  Button,
-  Card,
-  CardBody,
-  CardHeader,
-  CardTitle,
-  CardFooter,
-  Collapse,
-  ListGroup,
-  ListGroupItem
-} from "reactstrap";
-
-class ContractFunction extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {inputs: {}, optionsCollapse: false, functionCollapse: false};
-  }
-
-  static isPureCall(method) {
-    return (method.mutability === 'view' || method.mutability === 'pure');
-  }
-
-  static isEvent(method) {
-    return !this.isPureCall(method) && (method.type === 'event');
-  }
-
-  buttonTitle() {
-    const {method} = this.props;
-    if (method.name === 'constructor') {
-      return 'Deploy';
-    }
-
-    return ContractFunction.isPureCall(method) ? 'Call' : 'Send';
-  }
-
-  inputsAsArray() {
-    return this.props.method.inputs
-      .map(input => this.state.inputs[input.name])
-      .filter(value => value);
-  }
-
-  handleChange(e, name) {
-    let newInputs = this.state.inputs;
-    newInputs[name] = e.target.value;
-    this.setState({inputs: newInputs});
-  }
-
-  handleCall(e) {
-    e.preventDefault();
-    this.props.postContractFunction(this.props.contractProfile.name, this.props.method.name, this.inputsAsArray(), this.state.inputs.gasPrice * 1000000000);
-  }
-
-  callDisabled() {
-    return this.inputsAsArray().length !== this.props.method.inputs.length;
-  }
-
-  toggleOptions() {
-    this.setState({
-      optionsCollapse: !this.state.optionsCollapse,
-    });
-  }
-
-  toggleFunction() {
-    this.setState({
-      functionCollapse: !this.state.functionCollapse,
-    });
-  }
-
-  render() {
-    return (
-      <Col xs={12}>
-        <Card>
-          <CardHeader>
-            <CardTitle className="collapsable contractFunction" onClick={() => this.toggleFunction()}>
-              {ContractFunction.isPureCall(this.props.method) &&
-                <button class="btn btn-brand btn-sm" style={{ "color": "#fff", "background-color": "#ff4500", "border-color": "#ff4500", "float": "right" }}>call</button>
-              }
-              {ContractFunction.isEvent(this.props.method) &&
-                <button class="btn btn-brand btn-sm" style={{ "color": "#fff", "background-color": "#aad450", "border-color": "#aad450", "float": "right" }}>event</button>
-              }
-              {this.props.method.name}({this.props.method.inputs.map(input => input.name).join(', ')})
-            </CardTitle>
-          </CardHeader>
-          <Collapse isOpen={this.state.functionCollapse}>
-            <CardBody>
-              <Form action="" method="post" inline>
-              {this.props.method.inputs.map(input => (
-                <FormGroup key={input.name} className="pr-1">
-                  <Label for={input.name} className="pr-1">{input.name}: </Label>
-                  <Input name={input.name} id={input.name} placeholder={input.type} onChange={(e) => this.handleChange(e, input.name)}/>
-                </FormGroup>
-              ))}
-              </Form>
-              {!ContractFunction.isPureCall(this.props.method) &&
-                <Col xs={12} style={{"margin-bottom": "5px", "margin-top": "5px"}}>
-                  <Row>
-                  <strong className="collapsable" onClick={() => this.toggleOptions()}><i className={this.state.optionsCollapse ? 'fa fa-caret-down' : 'fa fa-caret-right'}/>Advanced Options</strong>
-                  <Collapse isOpen={this.state.optionsCollapse}>
-                    <Form action="" method="post" inline>
-                      <FormGroup key="gasPrice" className="pr-1">
-                        <Label for="gasPrice" className="pr-1">Gas Price (in GWei)(optional)</Label>
-                        <Input name="gasPrice" id="gasPrice" onChange={(e) => this.handleChange(e, 'gasPrice')}/>
-                      </FormGroup>
-                    </Form>
-                  </Collapse>
-                 </Row>
-               </Col>
-              }
-              <div align="right">
-                <Button color="primary" disabled={this.callDisabled()} onClick={(e) => this.handleCall(e)} >
-                  {this.buttonTitle()}
-                </Button>
-              </div>
-            </CardBody>
-          </Collapse>
-          {this.props.contractFunctions && this.props.contractFunctions.length > 0 && <CardFooter>
-            <ListGroup>
-              {this.props.contractFunctions.map(contractFunction => (
-                <ListGroupItem key={contractFunction.result}>
-                  {contractFunction.inputs.length > 0 && <p>Inputs: {contractFunction.inputs.join(', ')}</p>}
-                  <strong>Result: {contractFunction.result}</strong>
-                </ListGroupItem>
-              ))}
-            </ListGroup>
-          </CardFooter>}
-        </Card>
-      </Col>
-    );
-  }
-}
-
-ContractFunction.propTypes = {
-  contractProfile: PropTypes.object,
-  method: PropTypes.object,
-  contractFunctions: PropTypes.arrayOf(PropTypes.object),
-  postContractFunction: PropTypes.func
-};
-
-const filterContractFunctions = (contractFunctions, contractName, method) => {
-  return contractFunctions.filter((contractFunction) => (
-    contractFunction.contractName === contractName && contractFunction.method === method
-  ));
-};
-
-const ContractFunctions = (props) => {
-  const {contractProfile} = props;
-
-  return (
-    <Row>
-      {contractProfile.methods
-        .filter((method) => {
-          return props.onlyConstructor ? method.type === 'constructor' : method.type !== 'constructor';
-        })
-        .map(method => <ContractFunction key={method.name}
-                                         method={method}
-                                         contractFunctions={filterContractFunctions(props.contractFunctions, contractProfile.name, method.name)}
-                                         contractProfile={contractProfile}
-                                         postContractFunction={props.postContractFunction}/>)}
-    </Row>
-  );
-};
-
-ContractFunctions.propTypes = {
-  onlyConstructor: PropTypes.bool,
-  contractProfile: PropTypes.object,
-  contractFunctions: PropTypes.arrayOf(PropTypes.object),
-  postContractFunction: PropTypes.func
-};
-
-ContractFunctions.defaultProps = {
-  onlyConstructor: false
-};
-
-export default ContractFunctions;
-
diff --git a/embark-ui/src/components/ContractOverview.js b/embark-ui/src/components/ContractOverview.js
index 837ced4c7..ed0b9ad36 100644
--- a/embark-ui/src/components/ContractOverview.js
+++ b/embark-ui/src/components/ContractOverview.js
@@ -79,12 +79,12 @@ class ContractFunction extends Component {
     return (
         <Card>
           <CardHeader>
-            <CardTitle className="collapsable contractFunction" onClick={() => this.toggleFunction()}>
+            <CardTitle className="collapsable" onClick={() => this.toggleFunction()}>
               {ContractFunction.isPureCall(this.props.method) &&
-                <button class="btn btn-brand btn-sm" style={{ "color": "#fff", "background-color": "#ff4500", "border-color": "#ff4500", "float": "right" }}>call</button>
+                <button className="btn btn-warning btn-sm float-right">call</button>
               }
               {ContractFunction.isEvent(this.props.method) &&
-                <button class="btn btn-brand btn-sm" style={{ "color": "#fff", "background-color": "#aad450", "border-color": "#aad450", "float": "right" }}>event</button>
+                <button className="btn btn-info btn-sm float-right">event</button>
               }
               {this.props.method.name}({this.props.method.inputs.map(input => input.name).join(', ')})
             </CardTitle>