Fix the layouts from the connect part