added custom toast and fixed button