Loading layout improvements