Fix ref
Layout changes