Minor improvement to the layout