A few more layout and style consistancy fixes