First update to  app layout and welcome view