Adding buttons and Stop/Start functionality