Redid the entire layout