Yeah, I wanted to avoid refactoring styles where possible -- I agree the layout should this should be revisited.