fixed postfix conversion and merged form into calculator.php