Resolve style issues