layout and style fixes