Added socket window to the main startup screen
Fixed merge conflict