redesign and width fix