redid layout, need to clean tons of stuff up