Layout

A few fixes for layout and style.