Menu added (not completed) and fix one bug