Move topbar, flash into layout