Improved layout, continued work on the moscow crannies