Remove some uneeded alerts and button-groups duplication