changed overall layout