Improved formatting of numbers.
Made the menus more rational.