Fix style ordering