Added flashes and a few minor layout modifications.