Added start/stop buttons
Merging Greg and Andrew's code for Main Activity