Add markdown includes helper
Improve layout