Layout style fixes