cleaning up and adding menu and tree