redid layout a little