changed structure and styles