updated structure and styles