Added propper toast messages