Added new button, fixed bug with matched words