redid the basic layout