Indicators added, and some fancy new buttons. We may want to relocated the buttons to the div on the right.