Refactored _includes and _layout