Small tweaks in layout and style