redid layout again