Use includes to simplify layouts
closes #27