Little Changes in the Main Window and indicator management