Minor layout and style updates