changed a lot of layout in xml