New layout, router adding and connecting works now