Clean up formatting of some system views