Latest style and structure modifications