Layout fixes
Bugfix in include path