Moved some content to includes