Fix the dastardly empty layout issue