Corrections to layout.
Leftover code from external project removed.