Update Tile and Toast notifications to use new paradigm
Some minor updates