Improve mxit layouts