X: add actually useful layout