Huge commit. See extended description

New layout...