Added menu and forms