Remove Beta option
Tweak Toast