Added button press handling, I seem to have not implemented it before...?