Disabled main screen alterations for now and fixed trace_flow()