Fixed calculator app to final version