Added Detailed Calculator and refined Simple Calculator