More messing with layouts and includes