Hub layout fix