#7 added alert bubbles and admin screen