Fix space / layout issue