Non-core: latest amends to visuals