Ooops, put some files in the wrong place
Added button handling code