removed margins and paddings and changed some texts