Some references tweaks and layout experiments