Updates for toasts, changes to xml, added some new classes