Upgrading layout and style