Further improvements to styling