redid the whole layout