Updated layouts and universal links