Added stop button, fixed button alignment