Added longer buttons and better demo