Update layout to ref and auto add Layout suffix