redid layout as sensei said