Updated flash messaing and aligned layout