Removing some weirdness on the layout