More layout and style updates