Several changes

Added a basic calculator on the menu