More Style Fixes

UFP Edits