Add correct button behaviour