Use same styling as old version