Changing layout a bit to help with autotest