Minor changes on Main Window