Layout fix for Speaker addition