A few minor fixes for the layout