Separte logic in _includes, _layouts files

Move markup to _includes directory