Remove the empty layout and use null instead