Added menu generation and sections definition and inclusion