Bundle of design/style fixes