More layout and style improvements