Trivial layout adjustments
Adjustments to selection file format

To better handle non-transformable selections.