Improved menu, Custom Calc bug fix