Set defalt tab to system_info for #2006
Minor code cleanup. #2006