Better Manual layout.
Moved some data around and corrected test cases accordingly.