fix some button behaviour