Added initial layouts and more disconnect handling.