Moved much HTML to includes