Adding stop button to layout and minor changes on Main class